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

Change-Id: I88b0169785216ce097dd404b5459081321253da9