Snap for 4593582 from fe263b2505fe71584149874ee8a441149676bd9a to pi-preview1-release

Change-Id: I8b7744d3804f19e43dd157c97731e893b4312884
diff --git a/Android.mk b/Android.mk
index 40219a2..1d862dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
 LOCAL_SRC_FILES := $(sgdisk_src_files)
-LOCAL_CFLAGS += -Wno-unused-parameter -Werror
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-pragma-pack -Werror
 
 LOCAL_SHARED_LIBRARIES := libext2_uuid
 
@@ -42,7 +42,7 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
 LOCAL_SRC_FILES := $(sgdisk_src_files)
-LOCAL_CFLAGS += -Wno-unused-parameter -Werror
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-pragma-pack -Werror
 
 LOCAL_SHARED_LIBRARIES := libext2_uuid