Merge "Fix a typo in HACKING.txt."