Remove armv7 special case