Backed out changeset 2c001ca401cc (bug 927128) for Android bustage. a=backout