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

Change-Id: Idbab599484e91be4719c254e94ac1cfaa69793bf