Merge "Revert "imgdiff: Generate statically linked imgdiff.""
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 7b46c59..a15ac02 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -97,6 +97,5 @@
     libdivsufsort64 \
     libdivsufsort \
     libz
-LOCAL_NO_FPIE := true
-LOCAL_LDFLAGS := -static
+LOCAL_FORCE_STATIC_EXECUTABLE := true
 include $(BUILD_HOST_EXECUTABLE)