Fix windows build issues for Clang.

Change-Id: I7a388d67a5f2c67b4c0bc73b34f50f286f254d41
Merge commit 'a5f6b0357718969ef230b79b02f717db241c9dc0' into jb-4.3