Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 1072 matching lines @@
           ],
           'export_dependent_settings': [
             '../base/base.gyp:base',
             '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
             '../content/content.gyp:content_java',
           ],
           'variables': {
             'package_name': 'chrome',
             'java_in_dir': '../chrome/android/java',
           },
-          'includes': [ '../build/java.gypi' ],
+          'includes': [
+            '../build/java.gypi',
+          ],
         },
-      ]}, # 'targets'
+      ], # 'targets'
+      'includes': [
+        'chrome_android.gypi',
+      ]}, # 'includes'
     ],  # OS=="android"
   ],  # 'conditions'
 }