Merge "buildbot: Include dx-tests"
am: 0ca1ae25d3

Change-Id: I61698cd9a546e19d345b884fba80a4ef7388388f