Merge change 27088 into eclair

* changes:
  integrate bsdiff into imgdiff, instead of using subprocess