Fix -Wundef in _MSC_VER check. am: 00fa4482d8 am: c8254b2407
am: 63756423f7

Change-Id: Ib6991290585f6e4cc0aba1dad71f3b6a81fc1ab1