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

Change-Id: Ic2c52530be46172db19d3bd10c619cff97b4d983