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

Change-Id: I2039bd3a8ed13bb5f60cc91fb2d48f039c5a8adc