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

Change-Id: I1ee6b41054c522b8856fb1eb80b49e68b7e82f32