Merge "msm_shared: Remove unused timer related definitions"