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

Change-Id: I0491a61e2229ec76e81398774540d5a08d9d7215