Android scripts: add --verbose, fix missing 'source android_setup'

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
@@ skipping 15 matching lines @@
     shift
   elif [[ "$1" == "-t" ]]; then
     BUILDTYPE=$2
     shift
   elif [[ "$1" == "--release" ]]; then
     BUILDTYPE=Release
   elif [[ "$1" == "--clang" ]]; then
     USE_CLANG="true"
   elif [[ "$1" == "--logcat" ]]; then
     LOGCAT=1
+  elif [[ "$1" == "--verbose" ]]; then
+    set -x
   else
     APP_ARGS=("${APP_ARGS[@]}" "${1}")
   fi
   shift
 done
 
 function verbose {
   if [[ -n $VERBOSE ]]; then
     echo $@
   fi
@@ skipping 208 matching lines @@
       adb_push_if_needed $HOST_SRC $ANDROID_DST
     else
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
   fi
 }
 
 setup_device "${DEVICE_ID}"