Merge "codec2: fix to encode smpte2094-40 for gralloc4 metadata"