Merge "Add missing com.android.media.swcodec to apex_available" am: b9fb6fdc1c am: a9b0e178ae

Change-Id: Id8a8565081aabc6abeb44d1153d6e0030cf7fb54