Merge "Unbreak buildbot dx host tests"
am: 1194f8f6ec

Change-Id: If9b822b6002f42efe4b9f424c8876380a0385873