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

Change-Id: I24e5a2460ce10ea291ad8938e9b40c4c55c35163