am ab9167bd: Merge "Changed default non-full tests to be prebuild."

* commit 'ab9167bd054eaa8469a73250e33034b5109a7b6e':
  Changed default non-full tests to be prebuild.

diff --cc test/Android.run-test.mk
index a663b8b,4f03347..9623075
--- 1/test/Android.run-test.mk
--- 2/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@@ -103,12 -108,10 +108,13 @@@ ART_TEST_KNOWN_BROKEN += $(foreach test
  
  # Tests that need more than 2MB of RAM or are running into other corner cases in GC stress related
  # to OOMEs.
 -TEST_ART_BROKEN_GCSTRESS_RUN_TESTS :=
 +TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
 +  074-gc-thrash \
 +  080-oom-throw \
 +  096-array-copy-concurrent-gc
  
  ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-relocate))
+ ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-no-prebuild))
  ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-prebuild))
  ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-norelocate))
  ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,))