Merge "Fix update.sh to pull in 64-bit prebuilt libc++.so."