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

Change-Id: I495e425b747ba61d2eccc3919bec44d9c31be421