[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 5e392a25a7  -s ours am: 2841afd9b6  -s ours
am: f3be29c066  -s ours

Change-Id: I8ef99f05d5e461b11fb5e85f8c7b6185ac69cf1d
diff --git a/Android.bp b/Android.bp
index 080b563..c9749ad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,4 +65,13 @@
     export_include_dirs: ["."],
 
     shared_libs: ["liblog"],
+
+    sanitize: {
+        integer_overflow: true,
+        misc_undefined: ["bounds"],
+        diag: {
+            integer_overflow: true,
+            misc_undefined: ["bounds"],
+        },
+    },
 }