am 28fcfdd7: Fix broken server Windows SDK build.

Merge commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da'

* commit '28fcfdd7dd8752bc9accf800306d82a3a8d138da':
  Fix broken server Windows SDK build.