Merge "android.hardware.media.c2: sync with internal"