Only build batt_health and charge_only_mode for msm8960 devices
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2