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

Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a