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

Change-Id: Iddafc0379c437b1cddbc1097080e22c0dbe0d68d