Merge "clean_header: Write to correct dst_file" am: b95c8af8c9
am: 108268a143

Change-Id: If2b17370ce5e23ea0a7d8900def57088dd7fd143