Merge "android.hardware.media.c2: Move to staging/"