am 8b0ab0a6: Merge "Fix Windows SDK build."

* commit '8b0ab0a6c33816485acf4a9a1864d5e4fd645ce2':
  Fix Windows SDK build.