Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa
am: 304c389360

Change-Id: I6a7e5721fdefc37955a7293d359c317471eb0b31