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

Change-Id: If710c0ad0f7bed21bba7c3db6e61164a8365202d