Merge "Turn off some more warnings on Windows."
am: 20fdad0a68

Change-Id: I00a3df7ee552bdb5e4fc3e42e698ccb9631deea9