Strip newlines from each line in make.conf.

prebuilt.py

Index: prebuilt.py
diff --git a/prebuilt.py b/prebuilt.py
index 1d5acacd462c86aee08f0463b9c6a2a051b32e8e..904ee74a840460d7dca07c8ce62d25e11b9482d2 100755
--- a/prebuilt.py
+++ b/prebuilt.py
@@ -89,8 +89,11 @@ def UpdateLocalFile(filename, value, key='PORTAGE_BINHOST'):
   file_lines = []
   found = False
   for line in file_fh:
+    # Strip newlines from end of line. We already add newlines below.
+    line = line.rstrip("\n")
+
     if '=' not in line:
-      # Skip any line without an equal in it and just write it out
+      # Skip any line without an equal in it and just write it out.
       file_lines.append(line)
       continue