Merge "Move testrunner.py to argparse"
am: bbce11ce74

Change-Id: I656ae4d03398a0b9f8308180a91cfcfc15131762