Move to bionic platform include.

Bug: 141560639

Test: Builds.
Change-Id: Iccc1cc09135399c6f7d4f33a0483762cd28ae43a
Merged-In: Iccc1cc09135399c6f7d4f33a0483762cd28ae43a
(cherry picked from commit ddd1d6b32c7b79ee8d5d1c00907a47d5d9834e9f)
5 files changed