Merge "releasetools: Refactor the condition checking for using imgdiff."
am: bec8be51a5

Change-Id: I4cabec977a8a6d963c707d95dff398be2aff3140