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

Change-Id: I546badd5e79017d42544fa10e7afb2c9da70275c