am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."

* commit 'ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473':
  Fix windows sdk build.