Merge \\"releasetools: Disable using imgdiff for squashfs.\\" into nyc-dev am: a8d3741f1a
am: df56506d30

Change-Id: I13ca173094d0fad8e5a4db592ef11e54345aa11d