Merge "cutils: trace: use ANDROID_SMP to switch atomics"