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

Change-Id: I8a649f67e648f57e23cae786a9dc4ab700822296