Merge "Refresh 64-bit headers/libs; upgrade libc++ to r207307"