Merge "Update dx tests and test runner scripts"
am: 105c25c441

Change-Id: I01dc7f71f22489c741a0c70ec41f05195b3ac970