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

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