Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: e5dadf6358 am: 5cfe5957ad am: 8cd092d67d am: 3802645493 am: 41b8a4cbe8

Change-Id: I145ebc40de33bc7f3a0aaec7a1654280dcb61dbb