Merge "Fix newline symbols in files added in aosp/1183241" am: f6cd76eef9
am: 0b559d3752

Change-Id: I12ac10effbe41c09601141cc8e716f2d8140592e