Revert "fix scorpion build"

This commit should be in android_bionic

This reverts commit 3090146fc7a2beb60fe182442c655812cb9d76df.

Change-Id: Ib991217f86d689d55410bffa70ec8fea3116687d
Merge remote branch 'omni/android-4.4' into android-4.4