Revert r95841 due to failing media_unittests on linux_shared bot.

remoting/remoting.gyp

Index: remoting/remoting.gyp
===================================================================
--- remoting/remoting.gyp	(revision 95843)
+++ remoting/remoting.gyp	(working copy)
@@ -213,6 +213,15 @@
             'host/plugin/host_plugin.rc',
           ],
         }],
+        ['target_arch=="arm"', {
+          'dependencies': [
+            '../third_party/libvpx/libvpx.gyp:libvpx_lib',
+          ],
+        }, {
+          'dependencies': [
+            '../third_party/libvpx/libvpx.gyp:libvpx',
+          ],
+        }],
       ],
     },  # end of target 'remoting_host_plugin'
     {
@@ -335,19 +344,12 @@
       ],
       'conditions': [
         ['target_arch=="arm"', {
-          'dependencies': [
-            '../third_party/libvpx/libvpx.gyp:libvpx_lib',
-          ],
           'sources!': [
             'base/decoder_vp8.cc',
             'base/decoder_vp8.h',
             'base/encoder_vp8.cc',
             'base/encoder_vp8.h',
           ],
-        }, {
-          'dependencies': [
-            '../third_party/libvpx/libvpx.gyp:libvpx',
-          ],
         }],
       ],
     },  # end of target 'remoting_base'