Merge "Additional mediametrics for MediaCodec" into rvc-dev am: 09a8853862 am: ec5023ff39

Change-Id: Icd249fb525f79ce8962aafe2e3ccaf9205d39d89