Merge "defconfig: msm8612: Enable light/proximity sensor driver STK3X1X"