Merge "Clean up adb_trace_init."