DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I9415e8fc78e60c0e8cc599e0a77ffbc9f602d63a
diff --git a/Android.bp b/Android.bp
index 3d1330c..68a7959 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,6 +10,7 @@
         "-O2",
         "-g",
         "-fno-strict-aliasing",
+        "-fwrapv",
         "-D_GNU_SOURCE",
         "-DHAVE_IPV6",
         "-DNOT_HAVE_SA_LEN",