Merge "Adjust IMapperMetadataTypes.h to match gralloc4 encoding"