Revert 194991 "[Android] Fix null-build broken by https://codere..."

Breaks the strip step.

> [Android] Fix null-build broken by https://codereview.chromium.org/14322004/
> 
> The change unintentionally made the "always re-run strip" logic apply to
> non-component build as well. Restored the original logic.
> 
> BUG=158821
> NOTRY=true
> 
> Review URL: https://chromiumcodereview.appspot.com/14057015

TBR=yfriedman@chromium.org

Review URL: https://codereview.chromium.org/14320017

git-svn-id: http://src.chromium.org/svn/trunk/src/build@195092 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/strip_native_libraries.gypi

@@ -9,7 +9,6 @@
 #  {
 #    'actions': [
 #      'variables': {
-#        'intermediate_dir': 'location to place intermediate build artifcats'
 #        'ordered_libraries_file': 'file generated by write_ordered_libraries'
 #        'strip_stamp': 'file to touch when the action is complete'
 #        'stripped_libraries_dir': 'directory to store stripped libraries',
@@ -27,24 +26,12 @@
     '<(DEPTH)/build/android/gyp/strip_library_for_device.py',
     '<(ordered_libraries_file)'
   ],
-  'variables': {
-    'strip_output_paths': [],
-    'conditions': [
-      ['component == "shared_library"', {
-        # Add a fake output to force the build to always re-run this step.  This
-        # is required because the real inputs are not known at gyp-time and
-        # changing base.so may not trigger changes to dependent libraries.
-        'variables': {
-          'strip_output_paths': [
-            '<(intermediate_dir)/<(strip_stamp).fake',
-          ],
-        },
-      }],
-    ],
-  },
   'outputs': [
     '<(strip_stamp)',
-    '<@(strip_output_paths)',
+    # Add a fake output to force the build to always re-run this step. This
+    # is required because the real inputs are not known at gyp-time and
+    # changing base.so may not trigger changes to dependent libraries.
+    '<(strip_stamp).fake',
   ],
   'action': [
     'python', '<(DEPTH)/build/android/gyp/strip_library_for_device.py',