Merge "Add METADATA to webp: BSD+Apache2=NOTICE" am: c6660becea am: e1bc8b4508

Change-Id: I0493aa72e483686e03659bb8272998f335196861