fix up build of libc
Revert "bionic: Merge bionic optimizations"

This reverts commit c1ea6348afbe2439adb8987a5895be4ad4474c9a.