Move sqlite-jdbc to be a static library

Change-Id: If02a0973eb7ba0291a75397dda5f221b810890de
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 11fcb82..d4afcd2 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -103,7 +103,8 @@
 LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit sqlite-jdbc
+LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit
+LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc
 LOCAL_DX_FLAGS := --core-library
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := tests
@@ -169,7 +170,8 @@
     LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml)
     LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex sqlite-jdbc-hostdex
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex
+    LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host
     LOCAL_DX_FLAGS := --core-library
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := tests