Merge "codec2: fix gralloc4 mapping"