Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/bionic into sm-jb-mr1

Android 4.2.2 release 1
Revert "Revert "Linaro string handling routines: Give a option to use the older method""

This reverts commit 11fcdcebd8738ea2a6ce1b30b4bd4b4644fb5127.
Merge remote-tracking branch 'sabermod/sm-jb-mr1' into cm-10.1-linaro