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

Change-Id: I6eadde00aefe195c900df1008fe670b32f412546