Merge "Enable libwebp for Windows" am: fed1aac803 am: b8f2892e1d
am: d92c002183

Change-Id: I13e6b85960b79ec4dff841bda052e642475e91c5