Merge "ART: TI Agent test library refactor"
am: 1927f66beb

Change-Id: Ie14195b4dcd9063af20acb21e0877a2222c8a277