Merge "Add support for a --run-test-option to testrunner."
am: 1e739fa949

Change-Id: I6f828418e264806330b75c4db810c6508f90cfa7