Merge \"CTS: Migrate DecoderConformanceTest to new metric logging.\" into nyc-dev
am: ea8bc7d425

Change-Id: Id99f31be2346ee745f3b2baafaa82b39c18858ce