Merge "Set -fno-strict-aliasing here so we can get rid of it globally"
diff --git a/Android.mk b/Android.mk
index 6a67c60..9fb74b1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -230,6 +230,8 @@
 
 LOCAL_CFLAGS += -D_GNU_SOURCE=1 -D_POSIX_SOURCE=1
 
+LOCAL_CFLAGS += -fno-strict-aliasing
+
 LOCAL_CFLAGS_32 += -DSIZEOF_LONG=4 -DSIZEOF_RLIM_T=4 -DHAVE_STAT64=1
 LOCAL_CFLAGS_64 += -DSIZEOF_LONG=8 -DSIZEOF_RLIM_T=8