am 6ceca9dc: resolved conflicts for merge of 428fad97 to mnc-dev-plus-aosp

* commit '6ceca9dcecc2287ec9756728f46e1fb331e1edb0':
  Remove libbacktrace definition of gettid.