Merge "Refactor the imgdiff" am: f411f3dcfb
am: 6c1a6c389b

Change-Id: Ifc13d6c9fad007909f49192a8e34d37083c0a682