am 3346eb65: am accebbfc: Merge "Fix win_sdk build."

* commit '3346eb65f978d53bc43d9cd73a65a486e83713e6':
  Fix win_sdk build.