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

Change-Id: Icc3a38a450cd0ada3c18caf4f9a7b9167d2ce2f2