Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
am: 1935dce8eb

Change-Id: If6e86d76bd8dfca6e91cc6eeda20cd1492980b1e