Allow prepackaged to still be passed and make learn_board work again

run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 136 matching lines @@
     else
       TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
     fi
     TMP_INSIDE_CHROOT=${TMP}
   fi
 
   trap cleanup EXIT
 
   remote_access_init
 
-  # HACK: Temporary hack for cros-workon conversion
-  # In cros-workon, we always use the prepackaged tests, because the locations
-  # where tests come from are possibly infinite.
-  [[ -n "${CROS_WORKON_SRCROOT}" ]] && \
-    FLAGS_prepackaged_autotest="/build/${FLAGS_board}/usr/local/autotest/"
-
   local autotest_dir=""
   if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
     learn_board
-    autotest_dir="${GCLIENT_ROOT}/src/third_party/autotest/files"
+    if [[ -n "${CROS_WORKON_SRCROOT}" ]]; then
+      autotest_dir="/build/${FLAGS_board}/usr/local/autotest"
+    else
+      autotest_dir="${GCLIENT_ROOT}/src/third_party/autotest/files"
+    fi
   else
     autotest_dir="${FLAGS_prepackaged_autotest}"
   fi
 
   local control_files_to_run=""
   local chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
   # Now search for tests which unambiguously include the given identifier
   local search_path=$(echo {client,server}/{tests,site_tests})
   # Include chrome autotest in the search path
   if [ -n "${CHROME_ROOT}" ]; then
@@ skipping 94 matching lines @@
       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
       "${args[@]}"
   done
 
   echo ""
   echo_color "yellow" ">>> Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 }
 
 main $@