Merge "Remove the prebuilt bionic headers."
am: 05c2d38dbc

Change-Id: Iafac4520b2379a73c2ec84c17219a8d1ed58dac9