Revert "Move ART gtests to general-tests."

This reverts commit 0e6d73a65e577e6416ee68490ca19ca3123f7fc6.

Reason for revert: I suspect it is causing failing post-submit tests 

Change-Id: I07bcd71537ef0cea8a1e8947b2e17a09df561a2c
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index 852ad7b..fe70a06 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -37,7 +37,6 @@
         "libnativebridge-headers",
     ],
     cppflags: ["-fvisibility=protected"],
-    test_suites: ["general-tests"],
 }
 
 cc_library_shared {
diff --git a/test/Android.bp b/test/Android.bp
index bd8fff4..62b2153 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -945,7 +945,7 @@
         ":com.android.art.testing",
         ":art-gtest-jars",
     ],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     test_config: "gtests-target.xml",
 }