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

Change-Id: I40938a55c1a3f1f6a0d9ad2f2824c48fafab953c