Merge "atrace: support new AIDL trace tag."