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

* commit '10cce72c4bbc8bb8e6466b5511e178321862658a':
  Remove androidGetTid.