Merge "Use bionic platform headers."
am: 539d37679c

Change-Id: Ib9b444ce9b8dc341e278e1e83aa0fa1587818b92