Merge "build/file_utils: Newline for mapping files"