Merge "arm: defconfig: msm8226: Enable QPNP_VIBRATOR"