Merge "Remove androidGetTid."