Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit a09a69aa107bf1ae186d32f0cf33c07af2644486

Change-Id: I0a964afdf9b982aba22e7d9dfb558c6ad91c6482
diff --git a/Android.mk b/Android.mk
index 9868fbe..98b6641 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := bouncycastle
 
 LOCAL_PACKAGE_NAME := CertInstaller
 LOCAL_CERTIFICATE := platform