Merge "audioflinger: define ANDROID_SMP, remove conditional tracing"