Merge "Add a -testdex variant for ART run-tests."
am: 6feb860f98

Change-Id: If1b7e05f15df5aa109bce475a8ea95f1b95bdb97