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

Change-Id: I0c1cd07933457734b057790ba4ca4939b93d9c06