Merge "Mediacodec to use C interface to mediametrics"
am: 0bab538b5c

Change-Id: I2a8c4c9f4e01e0572f69257fe85a71677a59fd53