Merge stage-aosp-master into pi-dev-plus-aosp
am: ad0af4b7ba

Change-Id: I3b4dbc1ca1da0ae2fb022ae5f3b120f1ff2fa536
diff --git a/Android.bp b/Android.bp
index 6165a7d..bf31f27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,4 +49,8 @@
 
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
+    sanitize: {
+        integer_overflow: true,
+        misc_undefined: ["bounds"],
+    },
 }