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

Change-Id: I8009ae764492123f72e4f108e05a8e47d5b29af2