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

Change-Id: I16ec671c25b8d2c62f9bd86e0e18a22d783293bb