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

Change-Id: I6df567d978180d76f78b53b64c494c694fa5288b