Merge "adb: fix adb trace tag"