Android R Beta 2
Merge "Add METADATA to webp: BSD+Apache2=NOTICE" am: c6660becea

Change-Id: I19c4d758b053c4f2cefe1321d63023f5fa5167a6