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

Change-Id: I28eef6aa3351728b92754c024a4ef2c65dd6252b