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

Change-Id: Ia202ef9e594fe69869573bb81593a6ffc4581688