Bug 1133983 - Allow overriding of resources in branding. r=nalexander

Change the order of the ANDROID_RES_DIRS to specify the branded
directory first: this way any resources specified in both locations
will use the version in the branding directory.

--HG--
extra : rebase_source : 51c51088b346a2cd2f1a9c670eb8960382c60101

mobile/android/base/moz.build

@@ -669,9 +669,10 @@ if not CONFIG['MOZILLA_OFFICIAL']:
         'org/lucasr/dspec/RawResource.java'
     ] ]
 
+# Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
-    SRCDIR + '/resources',
     TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
+    SRCDIR + '/resources',
     OBJDIR + '/res',
 ]