am 46ed1c8c: am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."

* commit '46ed1c8c99fce33c78e239d4155ece84feca069d':
  Fix windows sdk build.