Merge "More cleanup to imgdiff & imgpatch" am: 3541934ff5
am: 91f8574061

Change-Id: I2ae1939a2a9452d23b3e659815e9e8f097c116a2