Revert "Bionic: Sync with AOSP master"

This reverts commit a500ab2c533ffcf29f3a5ae2c977e1bdce6d9adf.