Merge "Revert "Add missing com.android.media.swcodec to apex_available"" am: 9995bc0215 am: 7fffb1c87a am: 7e3588fe35

Change-Id: I25d25f80dea71aa1f63071e9524066578f40408c