Merge "media: refine media_codecs_performance.xml am: 471a26ded3 am: a55ae333a2" into nyc-mr1-dev-plus-aosp