Add ChromeShellTestApk and other chrome/ test stuff

components/bookmarks.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN version: //components/bookmarks/browser
       'target_name': 'bookmarks_browser',
       'type': 'static_library',
@@ skipping 107 matching lines @@
             '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_platform',
           ],
         }],
       ],
     },
   ],
   'conditions' : [
     ['OS=="android"', {
       'targets': [
         {
-          # GN: //components/common/android:bookmarks_java
+          # GN: //components/bookmarks/common/android:bookmarks_java
           'target_name': 'bookmarks_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             'bookmark_type_java',
           ],
           'variables': {
             'java_in_dir': 'bookmarks/common/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
-          # GN: //components/common/android:bookmarks_jni_headers
+          # GN: //components/bookmarks/common/android:bookmarks_jni_headers
           'target_name': 'bookmarks_jni_headers',
           'type': 'none',
           'sources': [
             'bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java',
           ],
           'variables': {
             'jni_gen_package': 'components/bookmarks',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
-          # GN: //components/common/android:bookmarks_type_javagen
+          # GN: //components/bookmarks/common/android:bookmarks_type_javagen
           'target_name': 'bookmark_type_java',
           'type': 'none',
           'sources': [
             'bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkType.template',
           ],
           'variables': {
             'package_name': 'org/chromium/components/bookmarks',
             'template_deps': ['bookmarks/common/android/bookmark_type_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
     }]
   ],
 }