Merge "dx: update run-test script and expectations"
am: 5a49fafa5d

Change-Id: Iae6db92d22b8736bdda0d80c04af4d16f95ac942