Merge "Use bionic platform headers." am: 05277b626b am: 18f9e77cff
am: 02df02ddce

Change-Id: I1d8ebec06d4365a205db613bf82e7eafd911fc24