Merge "header-checker: Cleanup create_reference_dumps.py" am: c5e05f9d7b am: aee80499b6
am: 5923931206

Change-Id: If58f945e5389d18e5836ae2fdd1020d9efd46aec