Merge "Fix SDK library paths for Windows and Darwin too."