am b44e626c: Merge "Fix windows sdk build."

* commit 'b44e626cf0c29dd8b8112db3d8e72970dc09b617':
  Fix windows sdk build.