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