address lint warnings after pylint upgrade

Newer pylint 1.6.5 emits warnings not seen with older versions.
Tweak the code to get lint clean again.

Bug: None
Test: ./tools/pylint.py no longer complains
Change-Id: Ib2f620ea4c60357430779c42b16d26a3b2ef2ca7
diff --git a/pre-upload.py b/pre-upload.py
index fe4cdd8..86f6da0 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -37,6 +37,9 @@
     sys.path.insert(0, _path)
 del _path
 
+# We have to import our local modules after the sys.path tweak.  We can't use
+# relative imports because this is an executable program, not a module.
+# pylint: disable=wrong-import-position
 import rh
 import rh.results
 import rh.config