apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ifi…

build/android/envsetup.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.
 
 # Sets up environment for building Chromium on Android. Only Android NDK,
 # Revision 6b on Linux or Mac is offically supported.
 #
 # To run this script, the system environment ANDROID_NDK_ROOT must be set
@@ skipping 31 matching lines @@
     ;;
   *)
     echo "Host platform ${host_os} is not supported" >& 2
     return 1
 esac
 
 export ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${toolchain_dir}/bin/"
 
 export ANDROID_SDK_VERSION="15"
 
-# Add Android SDK's platform-tools to system path.
-export PATH="${PATH}:${ANDROID_SDK_ROOT}/platform-tools/"
+# Add Android SDK/NDK tools to system path.
+export PATH=$PATH:${ANDROID_NDK_ROOT}
+export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
+export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
+
 
 if [ ! -d "${ANDROID_TOOLCHAIN}" ]; then
   echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2
   echo "The NDK version might be wrong." >& 2
   return 1
 fi
 
 if [ -z "${CHROME_SRC}" ]; then
   # If $CHROME_SRC was not set, assume current directory is CHROME_SRC.
   export CHROME_SRC=$(readlink -f .)
@@ skipping 63 matching lines @@
 export GYP_DEFINES="${DEFINES}"
 
 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
 export GYP_GENERATORS="make-android"
 
 # Use our All target as the default
 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
 # We want to use our version of "all" targets.
 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"