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

Change-Id: Id5033506f11c9269c4eab9a4436ad458884e15ed