Merge "Remove the error-prone TARGET_CPU_SMP from system/core."