Merge "Deprecate TestSuiteBuilder and related classes." am: a26000b8f5 am: fd61eb1e39
am: 9dcdc8f187

Change-Id: Icbc80cc054244f2660814bde4a9dc681b501024f