Merge "webp: update to v0.6.1" am: 0e74f28af0 am: f705a4a146
am: 9b452a3077

Change-Id: Id96084662089d19e8c63a61539fc9c17c5254ed9