Merge "Revert "Update ART run-tests for new Jack optimizations""