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

Change-Id: Ie4868bae28a932eee09594bc28fc61e9e70ecb2a