am 36473768: Merge "Clean up adb_trace_init."

* commit '36473768ef6996f2ddf767385a56964e3c88575d':
  Clean up adb_trace_init.