Merge "Rename media apex to com.android.media"