[automerger skipped] Merge "Mediacodec to use C interface to mediametrics" am: 0bab538b5c am: b42bdb3935 am: e23cbd2656 -s ours
am skip reason: Change-Id I04935343917ce400d0df531e06b4d23ab7269fa6 with SHA-1 bf536ac5e2 is in history

Change-Id: I7fbcf44066c0ea9139c0157cc9e90f063b15fc7d