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

Change-Id: I53821c7420491bfd173d497992fb03565eb0605a