Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed
am: 4e2471d6dd

Change-Id: I2bad2ab0bf7a4ff180b14dc772adc66e43b5406e