am 76c942c1: Merge "Fix Windows SDK build."

* commit '76c942c1645445a7b3f8b951db70f02cee270326':
  Fix Windows SDK build.