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

Merge commit '0646e78e9969762ead938f953c7283d984333d99'

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

fallouttester/platform_manifest,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,hagar006/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,knone1/platform_manifest,Hybrid-Power/startsync,see4ri/lolili,RR-msm7x30/platform_manifest,pranav01/platform_manifest