Merge "fix x86-darwin* build"