Nonlinear frequency shift of electrostatic waves in general collisionless plasma: Unifying theory of fluid and kinetic nonlinearities