Patch from Elliott Hughes for Android/bionic build.