Merge m-c to fx-team.

CLOBBER

@@ -18,6 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 934646 needs a clobber -- the icon resources previously copied
+Bug 934646 backout needs a clobber
-into $OBJDIR/mobile/android/base/res will conflict with those in
-$BRANDING_DIRECTORY/res.