Add the API stats file to the golden test

- Also clean up diff-and-update-golden.sh and the test python script.
  (removed -2 and -3 options, which I haven't used for a while)
- Random small fixes to HSG

Bug: 418286901
Test: atest tiny-framework-dump-test
    with and without intentional change to the new golden file
Test: ./diff-and-update-golden.sh
    with and without intentional change to the new golden file
Test: Run ravenwood-stats-collector.sh and make sure the generated
    CVS file doesn't change.
Flag: TEST_ONLY

Change-Id: Ice112cfc7f67b58abc43538ca81785569ed8efc9