Removed CXX_target for Android

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index da8a4ee57a3d4da47f250bb92b4da3f2bc061dfd..f91e5dafc88db4bf0ba4ea49c39a1c537247bb65 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -33,6 +33,9 @@ common_vars_defines() {
   fi
 
   toolchain_version="4.6"
+  # We directly set the gcc_version since we know what we use, and it should
+  # be set to xx instead of x.x. Refer the output of compiler_version.py.
+  gcc_version="46"
   toolchain_target=$(basename \
     ${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}-${toolchain_version})
   toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_target}"\
@@ -70,6 +73,7 @@ common_vars_defines() {
   # to canonicalize them (remove double '/', remove trailing '/', etc).
   DEFINES="OS=android"
   DEFINES+=" host_os=${host_os}"
+  DEFINES+=" gcc_version=${gcc_version}"
 
   if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
     DEFINES+=" branding=Chrome"