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

Change-Id: I2b3c2e6953cd61a8e6ff8690a5c7ed64b3487ea2