Revert "fix msvc build warnings and errors"

This reverts commit 32dbdff1b3e0acc863c57db8b11530f923b5a974.

Change-Id: I94ef281223f7abceb156714e8192d5ea5fdc2581
5 files changed