Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff
am: 92964b3b94

Change-Id: I21dcd0e8dc0020a7b45a85b53072284fe97c3f55