am b7f47c00: am 36473768: Merge "Clean up adb_trace_init."

* commit 'b7f47c0048dca475be194a473b5f53a3d0c15386':
  Clean up adb_trace_init.