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

Change-Id: Iad591557e160e5ee2d2b15becd0699c77f729e0a