Add moto_msm8960_jbbl to build barriers

Change-Id: Iead0f23870ccbe42eb032a925a94a42d561b07dd
Remove batt_health from qcom_common proprietary file list

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