Merge "atrace: support new AIDL trace tag."
am: 2e8ae4313b

Change-Id: I52a98b51532896aa17a4a83a38e90ba39679850d