Merge "give media apex access to libmediametrics"
am: 6a92b5c9c3

Change-Id: Ie39b395f7e4a09a95d1016f139cb7adca4cf6731