Bug 1007010 - Don't include mozconfig.cache twice in android debug mozconfigs. r=mshal

Also avoid multiple includes of mozconfig.cache to do nasty things even if
they slip in.

build/mozconfig.cache

@@ -4,6 +4,9 @@
 
 # Setup for build cache
 
+# Avoid duplication if the file happens to be included twice.
+if test -z "$bucket"; then
+
 read branch platform master <<EOF
 $(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
 EOF
@@ -62,3 +65,5 @@ else
         ;;
     esac
 fi
+
+fi

mobile/android/config/mozconfigs/android-armv6/debug

@@ -17,7 +17,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android-x86/debug

@@ -15,7 +15,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"

mobile/android/config/mozconfigs/android/debug

@@ -14,7 +14,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
-# Use ccache
-. "$topsrcdir/build/mozconfig.cache"
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"