Move to bionic platform include.

Bug: 141560639

Test: Builds.
Change-Id: Iae00fc17c05f46d7c7128850d8e122925ef42777
Merged-In: Iae00fc17c05f46d7c7128850d8e122925ef42777
(cherry picked from commit d96352d019b8400cb1f9c57342d008afadf4a877)
2 files changed