Merge "Mediacodec to use C interface to mediametrics"
am: 3f51e53b12

Change-Id: Ie4e1cbdef444de78602dc705577e8e77f99f4da5