Merge "libgrallocmapperincludes: as header lib and vendor" into oc-dev
am: 0b3004f38f

Change-Id: I8ab1e6ca321c8545866156c33febb924f63fc0b9