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

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 6c4c563d31e1b15ca7e7b4f0b2c86d8fa1724fcb..bfb214323fbc29d6d1ba5f4fc5613b9bcbc33953 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -49,8 +49,11 @@ export ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}/toolchains/arm-linux-androideabi-4
 
 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