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