Merge "Add METADATA to bsdiff: BSD+Apache2=NOTICE" am: 4500e02a8a

Change-Id: I548cc564cbc6fbc10fad6e3c53c80af372a19a3b