Update more files to build 10.9 wrappers.
Update tools.