Update HACKING as we've merged cxx into master