Merge "Provide more info for bsdiff/imgdiff exceptions." am: 53ba93d615 am: e742de1c4a
am: a9453d915d

Change-Id: I8eadeebba3a5e2c9778464ee7d6e97abe202a078