Merge "Recommend using pid instead of tid for gdbclient.py"