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

Change-Id: I74a9fecf5f9d9a2a21558738248dc41a38deab5a