Update for 2.5.0, be able to build lite and shared libs