Merge "libwebp-0.5.2"
am: ebb26ed7b4

Change-Id: I4e38b6ee4e525c6e0e4f889e1711bee7506362db