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