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

Change-Id: I625d9f44baa09529872507b188075b0c49b0421a