Merge "Make run-test support multiple --with-agent flags"
am: 89468aeaa6

Change-Id: Idd3e05bc86cd149202e1564e3ad930fde877cba7