cts: Add all tests to general-tests

Adds all the cts tests to general-tests so they can will
be included in the general-tests.zip file.

This cl was generated using the following command:
master/cts$ grep -rl "LOCAL_COMPATIBILITY_SUITE := cts" . | \
xargs sed -i \
's/LOCAL_COMPATIBILITY_SUITE := cts/LOCAL_COMPATIBILITY_SUITE := cts general-tests/g'

Bug: None
Test: make general-tests -j
Change-Id: Idbddf1560a31961cb2e6cab8cf55b55e22ecbbff

tests/cts/hostside/Android.mk

@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
 
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 

tests/cts/hostside/app/Android.mk

@@ -31,6 +31,6 @@ LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_DEX_PREOPT := false
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
 
 include $(BUILD_CTS_SUPPORT_PACKAGE)

tests/cts/hostside/app2/Android.mk

@@ -30,6 +30,6 @@ LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_DEX_PREOPT := false
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
 
 include $(BUILD_CTS_SUPPORT_PACKAGE)

tests/cts/net/Android.mk

@@ -47,7 +47,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 #LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
 
 include $(BUILD_CTS_PACKAGE)
 

tests/cts/net/appForApi23/Android.mk

@@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetTestAppForApi23
 LOCAL_SDK_VERSION := 23
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts general-tests
 
 include $(BUILD_CTS_PACKAGE)