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

* commit 'f4b5edf8e43e602bf683af67d262e2fbc728a450':
  Clean up adb_trace_init.