Merge "Fix "'module' object is not callable" error"

manifest_xml.py

@@ -27,7 +27,7 @@ else:
   import imp
   import urlparse
   urllib = imp.new_module('urllib')
-  urllib.parse = urlparse
+  urllib.parse = urlparse.urlparse
 
 from git_config import GitConfig
 from git_refs import R_HEADS, HEAD

subcmds/sync.py

@@ -34,7 +34,7 @@ else:
   import urlparse
   import xmlrpclib
   urllib = imp.new_module('urllib')
-  urllib.parse = urlparse
+  urllib.parse = urlparse.urlparse
   xmlrpc = imp.new_module('xmlrpc')
   xmlrpc.client = xmlrpclib