Cleanup gms update/preprocess scripts, roll android_tools

build/android/play_services/update_test.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Unittests for update.py.
 
 They set up a temporary directory that is used to mock a bucket, the directory
 containing the configuration files and the android sdk directory.
 
@@ skipping 283 matching lines @@
     _MakeDirs(self.paths.bucket)
 
     # is not configured via argument.
     update.SHA1_DIRECTORY = self.paths.config_dir
 
     os.environ['CHROME_HEADLESS'] = '1' if bot_env else ''
 
     if config_version:
       _MakeDirs(os.path.dirname(self.paths.config_file))
       with open(self.paths.config_file, 'w') as stream:
-        stream.write('{"version_number":%d}\n' % config_version)
+        stream.write(('{"version_number":%d,'
+                      '"version_xml_path": "res/values/version.xml"}'
+                      '\n') % config_version)
 
     if existing_license:
       _MakeDirs(self.paths.gms_root)
       with open(self.paths.gms_root_license, 'w') as stream:
         stream.write(existing_license)
 
     if existing_zip_sha1:
       _MakeDirs(self.paths.gms_root)
       with open(self.paths.gms_root_sha1, 'w') as stream:
         stream.write(existing_zip_sha1)
@@ skipping 90 matching lines @@
   try:
     original_raw_input = __builtins__.raw_input
     __builtins__.raw_input = lambda _: typed_string
     yield
   finally:
     __builtins__.raw_input = original_raw_input
 
 
 if __name__ == '__main__':
   unittest.main()