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

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