Merge "hrtimer: Don't reinitialize a cpu_base's lock on CPU_UP"