Merge "defconfig: msm: enable MSM_TIMER_LEAP config"