Android buildbot fixes

build/android/buildbot/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 46 matching lines @@
   export GOMA_DIR=/b/build/goma
   . build/android/envsetup.sh
 
   local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
      extra_gyp_defines)"
   export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
   if echo $extra_gyp_defines | grep -qE 'clang|asan'; then
     unset CXX_target
   fi
 
-  adb kill-server
-  adb start-server
-
   local build_path="${SRC_ROOT}/out/${BUILDTYPE}"
   local landmines_triggered_path="$build_path/.landmines_triggered"
   python "$SRC_ROOT/build/landmines.py"
 
   if [[ $BUILDBOT_CLOBBER || -f "$landmines_triggered_path" ]]; then
     echo "@@@BUILD_STEP Clobber@@@"
 
     if [[ -z $BUILDBOT_CLOBBER ]]; then
       echo "Clobbering due to triggered landmines: "
       cat "$landmines_triggered_path"
@@ skipping 319 matching lines @@
     return
   fi
   return $extract_exit_code
   )
 }
 
 # Reboot all phones and wait for them to start back up
 # Does not break build if a phone fails to restart
 function bb_reboot_phones {
   echo "@@@BUILD_STEP Rebooting phones@@@"
+  # Restart adb to work around bugs, sleep to wait for usb discovery.
+  adb kill-server
+  adb start-server
+  sleep .5
+
   (
   set +e
   cd $CHROME_SRC/build/android/pylib;
   for DEVICE in $(adb_get_devices); do
     python -c "import android_commands;\
         android_commands.AndroidCommands(device='$DEVICE').Reboot(True)" &
   done
   wait
   )
 }
@@ skipping 12 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP', '')"
 }