batt_health, charge_only_mode: Add moto_msm8960 to build barriers

Change-Id: I7f96dd3801f3913265d650879836bb197a46f905
Merge branch 'cm-11.0' into kk_mkt