Merge "Adds support for more gralloc1 functions to GrallocMapper."