Merge "Add patches for MacOS compilation."