Merge "Remove the prebuilt bionic headers."