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

Bug: 120848293
Change-Id: I76dcb8a77b5f0222a769e021c50f988f68af8f79
diff --git a/Android.bp b/Android.bp
index cd8db61..45d9065 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,6 +61,7 @@
     vndk: {
         enabled: true,
     },
+    double_loadable: true,
     recovery_available: true,
     srcs: libpcre2_src_files,
     target: {
diff --git a/OWNERS b/OWNERS
index 76622de..7529cb9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1 @@
-# Default code reviewers picked from top 3 or more developers.
-# Please update this list if you find better candidates.
-enh@google.com
-hhb@google.com
-jdanis@google.com
+include platform/system/core:/janitors/OWNERS