Merge "Make run-test support multiple --with-agent flags"