Merge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7
am: b5e2ecab4d

Change-Id: If73c4c104565d588266afde173bd7191a4580b11