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

Change-Id: I48f25bdd96d7777ac7f8302d5be54ca027ad5580