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

Change-Id: Ided93d7371d8a705b1648c448cd14c87d031a098