Merge "Remove empty newline in build.prop"