Backed out changeset 15a8086a2431 (bug 963621) for Android bustage.