Merge "Add a -testdex variant for ART run-tests." am: 5edf30c23d am: 832e01a099
am: 2baece252f

Change-Id: I4e8dd05272e1bcef6032c89f022856ad70ed36e9