Merge "defconfig: msm9625: Enable SPMI and QPNP drivers"