Merge \"Merge \\\"media: performance test tweaks\\\" into nyc-dev am: e49d45b347 am: bc1426600e\" into nyc-mr1-dev-plus-aosp
am: 91ce912abb

Change-Id: If0e82e04848dc50b1627ae2b395990a83b0dae2c