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

Change-Id: Iecc898a82c26e14bac69f80bfa87e7571bef13c1