Merge "timer: Don't reinitialize the cpu base lock during CPU_UP_PREPARE"