Backed out changeset 5fe88df5c376 (bug 892094) for Android 2.2 robocop-2 failures.

--HG--
rename : mobile/android/base/resources/xml/preferences_customize.xml.in => mobile/android/base/resources/xml/preferences_customize.xml
Backed out changeset 8bbd27688a89 (bug 870406) for Linux bustage.
Merge m-c to inbound on a CLOSED TREE.