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

Change-Id: I7e0f06900361f5ce0e82042fd5c2a6ae732145e3