Merge "Move to bionic platform include."
am: 636c03ef9f

Change-Id: I3c69dc9d2086e193a344a036f8f373e30ae14dfa