Merge "Enable dx tests to run in parallel by default" am: d3c99833e4
am: 3944d5f20d

Change-Id: I9b5595d83e6dad7126330771697ae386ccf2639a