Backed out changeset a1d95da23e97 (bug 976002) for Android xpcshell failures.