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

Change-Id: I3b330b31e0d84510cd2367bc480d52d5486ac678