Address syntax warnings in testrunner.py am: da144b68f4
am: 5964e2cef2

Change-Id: Ie7952626b04cb77640b49a78ff9340d696028f81