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

Change-Id: Ib326b63197c9eb4a7851445011f3dfdceabfc0e3