am 79b199b8: Merge "Fix Windows SDK build."

* commit '79b199b80e98ff7d0340de8c55f0da6d085e9ef8':
  Fix Windows SDK build.