Backed out changeset b38a8e2203a1 (bug 1024809) for Android 4 perma failures