Merge "Ship a 64-bit libc++.dylib in platform-tools"