android: Set gcc_version in build/common.gypi instead of in envsetup.

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 29cf44f19b8ca2288236859104f1c899bc8226b2..612e154cd2bb43ccd525342d9e435f14e19ce16c 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -44,9 +44,6 @@ common_vars_defines() {
   esac
 
   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}"\
@@ -86,7 +83,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
   # 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"