Merge "Print SHA1 of the patch if bsdiff fails with data error"
am: 1f9808bd48

Change-Id: I4900198d7c45c864e1a93bbd386b4ec36ed4cdec