Reapply "Changes according to review comments"

build/all_android.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.
 
 # This is all.gyp file for Android to prevent breakage in Android and other
 # platform; It will be churning a lot in the short term and eventually be merged
 # into all.gyp.
 
 {
   'targets': [
@@ skipping 42 matching lines @@
         ['"<(gtest_target_type)"=="shared_library"', {
           'dependencies': [
             # The first item is simply the template.  We add as a dep
             # to make sure it builds in ungenerated form.  TODO(jrg):
             # once stable, transition to a test-only (optional)
             # target.
             '../testing/android/native_test.gyp:native_test_apk',
             # Unit test bundles packaged as an apk.
             '../base/base.gyp:base_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
+            '../ui/ui.gyp:ui_unittests_apk',
           ],
         }]
       ],
     },
     { 
       # Experimental / in-progress targets that are expected to fail
       # but we still try to compile them on bots (turning the stage
       # orange, not red).
       'target_name': 'android_experimental',
       'type': 'none',
       'dependencies': [
         '../chrome/chrome.gyp:unit_tests',
       ],
     },
     {
       # In-progress targets that are expected to fail and are NOT run
       # on any bot.
       'target_name': 'android_in_progress',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_browsertests',
-        '../ui/ui.gyp:gfx_unittests',
       ],
     },
   ],  # targets
 }