Merge \"Fix google-explicit-constructor warnings in bsdiff\"
am: 58632a3b7c

Change-Id: Ifef4d6f4b4872d055d6615de1f180db6f2bbc01c