Merge "Add METADATA to zxing: Apache2=NOTICE" am: 7280bfc37b am: dcb3fa2622

Change-Id: Iccfe565d27429f62ad9cab4beb19e96b5fe936a4