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

Change-Id: Ic09207e2b9aa625d44c2094a6abcb569c3abdfed