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

Change-Id: I3e8d622bdec532e5ddfb051f891359c4e7d6f07e