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

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