Merge "Output *TS testcases to their own subdir in the common testcase folders." am: 4d49966ce3 am: ddb4256322
am: e50b42a578

Change-Id: Ia5201a9b334f3c85e383a230574defb2a6364a17