Merge "Refactor compare_images"
am: b33008068f

Change-Id: I0ae3430c6b5f7eb49df604b39fe2b2eb9d1ab425