[automerger skipped] Merge "Mediacodec to use C interface to mediametrics" am: 3f51e53b12 am: 8e7b2b5f9d am: 4c2f8767c6 -s ours
am skip reason: Change-Id I920b47da1316fb427837795fe3e2f625589f0b4d with SHA-1 8268c41743 is in history

Change-Id: Ie3b4e173ca84d3ee8467faac4c3bf54964933f77