am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."

* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.