Merge "atrace: support new AIDL trace tag." into pi-dev am: 27bda1e1e0
am: f55115a934

Change-Id: I982b8995633753642ba3d55819615e1f7672e136