Collisionless kinetic-fluid simulation of zonal flows in non-circular tokamaks