Merge changes I6345a10d,Ieed81827

* changes:
  Refactor header-checker tests
  Replace test data for test_libgolden_cpp_fabricated_function_ast_removed_diff