am 0e66c70d: am d07bfc51: Temporarily use blockimgdiff v2 for OTA.

* commit '0e66c70d0185f24df3e4af984f269f1263766af4':
  Temporarily use blockimgdiff v2 for OTA.