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

Change-Id: I1e3e7a029ae79a111cbf4b9beb30c0bc05d7cc17