Merge "Use TEST_ART_RUN_TESTS consistently"