[autotest] Revert frontend_wrapper.RetryingAFE in autoserv to frontend.AFE.

Not sure if this will fix the current failing VMTests but trying it out.

BUG=None
TEST=tryjob

Change-Id: I7d73b2471895fd4f4df34480182809f5d808aaf6
Reviewed-on: https://chromium-review.googlesource.com/362021
Reviewed-by: Dan Shi <dshi@google.com>
Commit-Queue: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@google.com>
diff --git a/server/autoserv b/server/autoserv
index 53f9a44..1901364 100755
--- a/server/autoserv
+++ b/server/autoserv
@@ -58,6 +58,7 @@
         print e
         sys.exit(1)
 
+from autotest_lib.server import frontend
 from autotest_lib.server import server_logging_config
 from autotest_lib.server import server_job, utils, autoserv_parser, autotest
 from autotest_lib.server import utils as server_utils
@@ -285,7 +286,7 @@
 
     logging.debug('Trying to start servod.')
     try:
-        afe = frontend_wrappers.RetryingAFE(timeout_min=5, delay_sec=10)
+        afe = frontend.AFE()
         board = server_utils.get_board_from_afe(machine, afe)
         hosts = afe.get_hosts(hostname=machine)
         servo_host = hosts[0].attributes.get('servo_host', None)
@@ -728,8 +729,7 @@
                 machines = parser.options.machines.replace(',', ' '
                                                            ).strip().split()
                 try:
-                    afe = frontend_wrappers.RetryingAFE(timeout_min=5,
-                                                        delay_sec=10)
+                    afe = frontend.AFE()
                     board = server_utils.get_board_from_afe(machines[0], afe)
                     timer = autotest_stats.Timer('autoserv_run_time.%s.%s' %
                                                  (board, test_name))