Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev