Fix GOMA_DIR on 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 612e154cd2bb43ccd525342d9e435f14e19ce16c..af241163d520b0771dc5bc4b744d85a7c724f0e0 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -96,6 +96,12 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
     export CHROME_BUILD_TYPE="_official"
   fi
 
+  # TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling
+  # everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var.
+  if [[ -d $GOMA_DIR ]]; then
+    DEFINES+=" use_goma=1 gomadir=$GOMA_DIR"
+  fi
+
   # The order file specifies the order of symbols in the .text section of the
   # shared library, libchromeview.so.  The file is an order list of section
   # names and the library is linked with option