Move to bionic platform include. am: fd64e56b9f
am: cee67ea10d

Change-Id: I6fdaca663cc5939f7ab5e5f1d3c7dbdf8246dc3d