Merge "Fix newline symbols in files added in aosp/1183241"