Merge "Fix the last users of TARGET_CPU_SMP."