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

Change-Id: I37c1a13bac0323798f0a26321d6a2c6bc8dd2997