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

Change-Id: I8e0e9f9b116da0b07ad89968eb8346aa1a0f04a8