am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."

* commit '3859029a48aa78150fa61eb4988214f8632b33ce':
  Remove androidGetTid.