Android merge

Same for the newline.