Merge \\\\"Fix google-explicit-constructor warnings in bsdiff\\\\" am: 58632a3b am: 6857c2c0 am: 0e2ce383 am: d8b25d29 Change-Id: Iee1ac51ea19a30d8e2370a4b9aff00180e198594