Merge "atrace: introduce tracing category for adb." am: 3c9a97902d am: 0deeeac8d1
am: 7c6061ed4b

Change-Id: Ie56c495139f0fa595c747066a0544f80bb388f1a