Merge "Revert "android.hardware.media.c2: Move to staging/"" into udc-dev-plus-aosp