Backed out changeset 97d17b777f68 (bug 944162) for Android bustage.