Merge stage-aosp-master into pi-dev-plus-aosp
am: 2e1c06cea6

Change-Id: I9bc06a44feaf9ce8e0e54dd16f0cc18ec416f35c
diff --git a/Android.bp b/Android.bp
index 01f038b..1d30052 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,4 +11,8 @@
     export_include_dirs: ["include"],
 
     sdk_version: "14",
+    sanitize: {
+        integer_overflow: true,
+        misc_undefined: ["bounds"],
+    },
 }