Snap for 4612226 from 4702f3aea3136e9e22e496d9c59bd9be491835ea to pi-release

Change-Id: I3a368c81aa7f487cc4a95197581746fb34b151de
diff --git a/Android.mk b/Android.mk
index f1fbc53..f2d7b5a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,7 @@
 LOCAL_SRC_FILES := $(apache-commons-math_src_files)
 LOCAL_JAVACFLAGS := -encoding UTF-8
 LOCAL_SDK_VERSION := current
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 # build host jar
@@ -38,4 +39,5 @@
 LOCAL_JAVACFLAGS := -encoding UTF-8
 LOCAL_SDK_VERSION := current
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_HOST_JAVA_LIBRARY)