Back out c8687e99dc75 (bug 913510) for Android bustage