Merge "Rename media apex to com.android.media" am: d8afe48311
am: 8a7f57252e

Change-Id: Iba0fcf21f42cd025eb5396cfa67b68be38e8e2a4