Merge \"media: refine media_codecs_performance.xml am: b0173b1131 am: 526066f604\" into nyc-mr1-dev-plus-aosp
am: a2f7f9215a

Change-Id: Idb9fe104be0dd9d7c748f404dc7a34b2325cfea7