Backed out changeset 46902f2ea759 (bug 1024614) for Android robocop crashes.