Merge "Revert "Retry: Add missing com.android.media.swcodec to apex_available""