Snap for 4632767 from 6ae402aa03bbc08d5007bcd2c4fac05dc3da0092 to pi-release

Change-Id: I2afd035be86fea56fc0ffeaee2de28ea98b02cbd
diff --git a/Android.bp b/Android.bp
index 6f40ce6..2ff68ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,7 +76,7 @@
     libs: [
         "okhttp-nojarjar",
         "junit",
-        "bouncycastle-nojarjar",
+        "bouncycastle-unbundled",
         "conscrypt",
     ],
     no_framework_libs: true,