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

* commit '7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.