Merge "Codec2: wrap gralloc handles with metadata"