Revert "Merge branch 'cm-10.2' of github.com:CyanogenMod/android_bionic into cm-10.2"

This reverts commit 8783c723a5859e608c9ce03690622ad289f3a490, reversing
changes made to 33ae416e3ab15852c1a388601dff311ac4d88227.