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

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