DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I43b97663a45fbbfbe86c22ee7a210f717d1db16b
diff --git a/Android.bp b/Android.bp
index 0f59e1b..db2bf19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -92,6 +92,7 @@
     vndk: {
         enabled: true,
     },
+    double_loadable: true,
     recovery_available: true,
     defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
     unique_host_soname: true,