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

Change-Id: I23f137865997ca9ce4aa229c9329d8ea9fbcb6ee