Merge "Revert "Remove the prebuilt bionic headers.""
am: c07303259b

Change-Id: Ib08a7d836b15e841da17b74203fa9146c99ba84d