Backout 780c48afccc1 (bug 831354) for Android reftest failures on a CLOSED TREE

mobile/android/Makefile.in

@@ -9,7 +9,7 @@ VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = ../locales locales base chrome components modules themes/core app fonts
+DIRS = ../locales locales base chrome components modules themes/core app
 
 ifndef LIBXUL_SDK
 PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit

mobile/android/fonts/Makefile.in

@@ -1,36 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-packaged_fonts =  \
-	CharisSIL-B.ttf \
-	CharisSIL-BI.ttf \
-	CharisSIL-I.ttf \
-	CharisSIL-R.ttf \
-	OpenSans-ExtraBold.ttf \
-	OpenSans-SemiboldItalic.ttf \
-	OpenSans-ExtraBoldItalic.ttf \
-	OpenSans-Italic.ttf \
-	OpenSans-Light.ttf \
-	OpenSans-LightItalic.ttf \
-	OpenSans-Bold.ttf \
-	OpenSans-Regular.ttf \
-	OpenSans-BoldItalic.ttf \
-	OpenSans-Semibold.ttf \
-	$(NULL)
-
-GARBAGE += $(packaged_fonts)
-
-include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/testing/testsuite-targets.mk
-
-libs:: $(packaged_fonts)
-	$(INSTALL) $^ $(DIST)/bin/res/fonts/
-

modules/libpref/src/init/all.js

@@ -3170,11 +3170,10 @@ pref("font.name.sans-serif.x-user-def", "Droid Sans");
 pref("font.name.monospace.x-user-def", "Droid Sans Mono");
 pref("font.name-list.sans-serif.x-user-def", "Roboto, Droid Sans");
 
-pref("font.name.serif.x-western", "Charis SIL, Droid Serif");
-pref("font.name.sans-serif.x-western", "Open Sans, Droid Sans");
+pref("font.name.serif.x-western", "Droid Serif");
+pref("font.name.sans-serif.x-western", "Droid Sans");
 pref("font.name.monospace.x-western", "Droid Sans Mono");
-pref("font.name-list.sans-serif.x-western", "Open Sans, Roboto, Droid Sans");
-
+pref("font.name-list.sans-serif.x-western", "Roboto, Droid Sans");
 
 pref("font.name.serif.zh-CN", "Droid Serif");
 pref("font.name.sans-serif.zh-CN", "Droid Sans");