am 033ea23f: am 7ad271e7: Merge "Update windows sdk to build non-recursively"

* commit '033ea23f59f78e253affbc0d2745083339ca1fd7':
  Update windows sdk to build non-recursively