Merge "Use bionic platform headers." am: 539d37679c am: 36469ac071
am: bf6df9ed52

Change-Id: I4f8980c6fd11f5c13e0f75b603a05e23288480a9