Fix --variant and add --mode device_testdex
am: 6555c78bfb

Change-Id: I6c912d4695ffe56eec19d40aa1417f12e7953407