am d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files

Merge commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp

* commit 'd7d7ab00f58bd75ac185273f93d15533558a7f54':
  do a pass of normal-chunk-merging before comparing src and tgt files