am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."

* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
  Fix SDK library paths for Windows and Darwin too.