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

Change-Id: I58547c3e48066d772004df24fc287f7c6df724a5