Merge "libwebp-1.0.0"
am: 4756f2b049

Change-Id: I5f8dcec3d39ca57692fe13aa656f7accc97ce708