Merge "Output *TS testcases to common testcase folders." am: 469c458279
am: 040b876e3e

Change-Id: I8786ec11f866865a2be1cdcc67971573b2c96ef6