Backed out changeset 63bc93801615 (bug 1086994) for Android bustage.