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

Change-Id: I440baf9e7ccac8863e30cbb2a5af73967a332a60