Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_bionic into kk44
Merge branch 'kk44' of git://github.com/scotthartbti/android_bionic into HEAD