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

Change-Id: Ia7ecb8e951b34def2fa567568145ae56309fbab9