Backed out changeset 2d6db5d2f985 (bug 1065818) for Android Crashes
Backed out changeset feea8b1ea75f (bug 1095438) for possibly breaking mulet 1 tests