am 35818570: am 1607b532: Merge "Fix OpenSSL build for the Windows SDK"

* commit '35818570032ff0e098b5fc1756185af50cd8a01c':
  Fix OpenSSL build for the Windows SDK