Merge "libwebp-0.5.2" am: ebb26ed7b4
am: ab7ea8bd43

Change-Id: I71ccb5035a6e02daf382f507b1ff7f01bc244b2a