am 08b0db8c: am 7b5f98e0: Merge "Fix the last users of TARGET_CPU_SMP."

* commit '08b0db8cedaa5d40e6912483220b339d4825a8f7':
  Fix the last users of TARGET_CPU_SMP.