Merge "Do not add -Wno-unused-lambda-capture for Windows" am: a6fdde3368 am: d55126300f
am: 9fe3b9b9ee

Change-Id: Ie0ea71616f309bcd226e613ff3e72b5b9904f87f