This is a GLibc-compatibility patch required to simplify our upcoming toolchain work/porting. Change-Id: I615a20a449763f86b6e2b0e4f5ab43fb029ceb6d