Merge "webp: update to v0.6.1"