Cleanup gms update/preprocess scripts, roll android_tools

build/install-build-deps-android.sh

 #!/bin/bash -e
 
 # 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.
 
 # Script to install everything needed to build chromium on android, including
 # items requiring sudo privileges.
 # See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions
 
 # This script installs the sun-java6 packages (bin, jre and jdk). Sun requires
 # a license agreement, so upon installation it will prompt the user. To get
 # past the curses-based dialog press TAB <ret> TAB <ret> to agree.
 
 args="$@"
 
-# TODO(dgn) remove this this argument from calls (http://crbug.com/541727)
-if test "$1" = "--skip-sdk-packages"; then
-  args="${@:2}"
-fi
-
 if ! uname -m | egrep -q "i686|x86_64"; then
   echo "Only x86 architectures are currently supported" >&2
   exit
 fi
 
 # Install first the default Linux build deps.
 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \
   --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}"
 
 lsb_release=$(lsb_release --codename --short)
@@ skipping 53 matching lines @@
       >& /dev/null
   then
     # If there are non-javaplugin.so errors, treat as errors and exit
     echo 'ERRORS: Failed to update alternatives for java-6-sun:'
     grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
     exit 1
   fi
 fi
 
 echo "install-build-deps-android.sh complete."