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

Change-Id: I9004d50829d18736f6d50f6bd48cb6d7c3b6e605