am 7fb0ee0c: Merge "Remove androidGetTid."

* commit '7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f':
  Remove androidGetTid.