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

Change-Id: Ia9fd728b7e61aacff41811848c81f84ad1559c4a