Merge "defconfig: msm8226: enable qpnp-charger"