Merge "clean_header: Don't print extraneous newline char" am: 0ce5c4440d
am: 6379127063

Change-Id: I2c6b57a3a69c401466d7796d990dbbe5836ceb23