Merge "Fix windows 64-bit builds" into nyc-dev
am: 242393fec1  -s ours

* commit '242393fec13d6703e1d2ef27873fc222cb1d3db3':
  Fix windows 64-bit builds