Merge "remove use of CTS_TESTCASES_OUT"
am: 24dd78a2d7

Change-Id: If15ad7d5f255f77bdf619d75bee393d6c661cc90