Merge "libwebp: update to 0.6.0" am: 6490b968ff
am: 20f92d1ba7

Change-Id: Ib682467b5f2403be4ace938f398705cc0da59767