Merge "Codec2: vndk: lock P010 with gralloc4 mapper first"