Snap for 4612226 from 181b44b0422f2ca9a844a39f0b7e7f20c2712b72 to pi-release

Change-Id: I34fa6b747bed1710629d53da59264b179578b90a
diff --git a/Android.mk b/Android.mk
index f863cf6..dc80a4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,8 @@
 
 LOCAL_SDK_VERSION := 9
 
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 
@@ -31,4 +33,6 @@
 
 LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
 
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
 include $(BUILD_HOST_JAVA_LIBRARY)