Snap for 4612226 from 166c78939dfb8ba09174c1d7741e0607c9d85bdb to pi-release

Change-Id: I6fabb4858074ad5fb188ed4647db31fd85d95452
diff --git a/Android.mk b/Android.mk
index 1e31ae0..266943f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
 LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_JAVA_LIBRARY)
 
 ifeq ($(HOST_OS),linux)
@@ -33,5 +34,6 @@
 LOCAL_SRC_FILES := $(apache-xml_src_files)
 LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 endif  # HOST_OS == linux