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

Change-Id: Ib71a3bf7ff95120669ed72d785adb9e14aafbbbf