Merge "Add patches required by Bionic and MacOS."