Backed out changeset 27a790bd9a90 (bug 968908) for Android bustage.