Merge "Refactor the imgdiff" am: f411f3dcfb am: 6c1a6c389b am: e500bc3e15 am: 12cd28fb9c
am: 6eae2f7023

Change-Id: Iaa24195286b770fad16446e9f4fe4c7e80e9dcb2