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

Change-Id: I03c82315091d0d211b4fbbe6c1dc426af1466cc1