Merge branch vanilla into gms

* ssh://ch-git3.arimacomm.com.tw:29418/kernel/msm-4.9:
  Setting jeita fv re-charge voltage for warm temp
  Add condition of charging current for thermal-mitigation

Change-Id: Idfe6d94533a09306edafc84cc1b5b8a64634d7d2