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

* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
  Fix SDK library paths for Windows and Darwin too.