Back out 2412b1a7b97e (bug 863872) for Android xpcshell orange