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

Change-Id: Ia85e5381e00bbd11bdc8aff3cf3fcda5e67c8640