Merge "Update hacking.py for @testtools.skip() formatting."