Merge "The buildbot now uses device_testdex as modes."
am: 21283ba50f

Change-Id: I259a2bbf6862aeeff273f9762ac43d0e3aec59e8