Revert "Merge github.com:CarbonDev/android_bionic into kk4.4"

This reverts commit 9b289edfc99111f681ee4cf1079aa54c32b3e19f, reversing
changes made to 2dd0a60f650d49053f02ab8b78e6dc2e99f729f0.