Fix gcstress and gcverify test targets

Make the build system look at the right variables to determine if these
should be on.

Change-Id: Iede993714eee773716cdc99181b10b280e96ca2a
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index aaf66cb..e4ee4a7 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -99,10 +99,10 @@
   TRACE_TYPES += trace
 endif
 GC_TYPES := cms
-ifeq ($(ART_TEST_GCSTRESS),true)
+ifeq ($(ART_TEST_GC_STRESS),true)
   GC_TYPES += gcstress
 endif
-ifeq ($(ART_TEST_GCVERIFY),true)
+ifeq ($(ART_TEST_GC_VERIFY),true)
   GC_TYPES += gcverify
 endif
 JNI_TYPES := checkjni