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

* commit 'ccad82c52e7c37c70fce579cf14377a88b885ae4':
  Revert "Temporarily use blockimgdiff v2 for OTA."