Changes from cm msm8960

- wifi settings moved out
- gps setting moved out
- charger change for kk bootloaders