Merge "Export test failure details in CtsVerifier." am: f09c397059
am: 6fb8be05d2

Change-Id: Ie9a8885bf0964b4998b3ff46d4340a07b3e1143c