Revert "Temporarily use blockimgdiff v2 for OTA."

The workround should stay in mnc-dr-dev branch only.

This reverts commit d07bfc519673fdba66448f0a81ef869b922c3804.

Change-Id: If8d2d88d50e87f031ed6df44b01a1e9e38a7f97f
diff --git a/core/Makefile b/core/Makefile
index 1805597..58d2881 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1512,7 +1512,7 @@
 	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
-	$(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
+	$(hide) echo "blockimgdiff_versions=1,2,3" >> $(zip_root)/META/misc_info.txt
 ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
 	# OTA scripts are only interested in fingerprint related properties
 	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt