Revert of Set use_rndis_forwarder in platform backend.

tools/telemetry/telemetry/user_story/android/shared_app_state.py

 # 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.
 import os
 
 from telemetry.core import platform
 from telemetry.core.platform import android_platform
 from telemetry.core import wpr_modes
 from telemetry.core.platform import android_device
 from telemetry.user_story import shared_user_story_state
@@ skipping 19 matching lines @@
     if not isinstance(
         test, timeline_based_measurement.TimelineBasedMeasurement):
         raise ValueError(
             'SharedAppState only accepts TimelineBasedMeasurement tests'
             ' (not %s).' % test.__class__)
     self._test = test
     self._finder_options = finder_options
     self._android_app = None
     self._current_user_story = None
     self._android_platform = platform.GetPlatformForDevice(
-        android_device.GetDevice(finder_options), finder_options)
+        android_device.GetDevice(finder_options))
     assert self._android_platform, 'Unable to create android platform.'
     assert isinstance(
         self._android_platform, android_platform.AndroidPlatform)
 
   @property
   def app(self):
     return self._android_app
 
   @property
   def platform(self):
@@ skipping 19 matching lines @@
   def GetTestExpectationAndSkipValue(self, expectations):
     """This does not apply to android app user stories."""
     return 'pass', None
 
   def TearDownState(self, results):
     """Tear down anything created in the __init__ method that is not needed.
 
     Currently, there is no clean-up needed from SharedAppState.__init__.
     """
     pass