Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Improve regen performance by setting cpu affinity

Test: m nothing (with new ckati prebuilt)
Change-Id: I90eee540ad65b330d2d3f833e1bc7dc775102fff
diff --git a/Android.bp b/Android.bp
index ab91582..ef7c990 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,11 @@
     defaults: ["ckati_defaults"],
     srcs: ["main.cc"],
     whole_static_libs: ["libckati"],
+    target: {
+        linux_glibc: {
+            shared_libs: ["libjemalloc"],
+        },
+    },
 }
 
 cc_binary_host {
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..d480f59
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+ccross@android.com
+dwillemsen@google.com
+hamaji@google.com