Move to bionic platform include.
am: fd64e56b9f

Change-Id: Ic732b3bd3516b3592b68a763fef1a1a002718ba1