Merge "Add METADATA to bzip2: Apache2+BSD=NOTICE" am: eb041812a7

Change-Id: I1a69e5717a7ae29d2d30a66ce28eb9822a6e9a5c