Merge "defconfig: msm8974: enable smb350 battery charger"