Tests for Compatibility Common Code

Host-side libraries are tested using Tradefed.

Device-side libraries are tested by bundling them, along with their tests,
into an app which is installed and instrumented.

Change-Id: I74494171f580b0dbd7c0c87e285d341a84c940f3
diff --git a/common/util/tests/Android.mk b/common/util/tests/Android.mk
index 3c9165f..9b0ef71 100644
--- a/common/util/tests/Android.mk
+++ b/common/util/tests/Android.mk
@@ -18,12 +18,9 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-                        junit \
-                        kxml2-2.3.0 \
-                        compatibility-common-util-hostsidelib_v2
+LOCAL_STATIC_JAVA_LIBRARIES := junit kxml2-2.3.0 compatibility-common-util-hostsidelib
 
-LOCAL_MODULE := compatibility-common-util-tests_v2
+LOCAL_MODULE := compatibility-common-util-tests
 
 LOCAL_MODULE_TAGS := optional