am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit 'c369f1993b41dac8ac1a005b3bc9312dfa5ebd63':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.