Revert of Roll Android SDK and AppCompat.

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android resources to generate R.java, and prepare for packaging.
 
 This will crunch images and generate v14 compatible resources
 (see generate_v14_compatible_resources.py).
 """
 
-import codecs
 import optparse
 import os
 import re
 import shutil
 import sys
 import zipfile
 
 import generate_v14_compatible_resources
 
 from util import build_utils
@@ skipping 82 matching lines @@
     raise Exception('Exactly one of --R-dir or --srcjar-out must be specified.')
 
   return options
 
 
 def CreateExtraRJavaFiles(r_dir, extra_packages):
   java_files = build_utils.FindInDirectory(r_dir, "R.java")
   if len(java_files) != 1:
     return
   r_java_file = java_files[0]
-  r_java_contents = codecs.open(r_java_file, encoding='utf-8').read()
+  r_java_contents = open(r_java_file).read()
 
   for package in extra_packages:
     package_r_java_dir = os.path.join(r_dir, *package.split('.'))
     build_utils.MakeDirectory(package_r_java_dir)
     package_r_java_path = os.path.join(package_r_java_dir, 'R.java')
-    new_r_java = re.sub(r'package [.\w]*;', u'package %s;' % package,
-                        r_java_contents)
-    codecs.open(package_r_java_path, 'w', encoding='utf-8').write(new_r_java)
+    open(package_r_java_path, 'w').write(
+        re.sub(r'package [.\w]*;', 'package %s;' % package, r_java_contents))
     # TODO(cjhopman): These extra package's R.java files should be filtered to
     # only contain the resources listed in their R.txt files. At this point, we
     # have already compiled those other libraries, so doing this would only
     # affect how the code in this .apk target could refer to the resources.
 
 
 def CrunchDirectory(aapt, input_dir, output_dir):
   """Crunches the images in input_dir and its subdirectories into output_dir.
 
   If an image is already optimized, crunching often increases image size. In
@@ skipping 178 matching lines @@
   if options.depfile:
     input_files += build_utils.GetPythonDependencies()
     build_utils.WriteDepfile(options.depfile, input_files)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   main()