am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build.""

* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
  Revert "Fix Windows SDK build."