Merge "Refractor the code for imgdiff" am: a2e7a07031
am: 68571e27d8

Change-Id: Ia09afb0b5c510171196e9b072506d973019dc60d