Merge "Recommend using pid instead of tid for gdbclient.py" am: 0d2105bf0b
am: d56fee7686

Change-Id: Ic38ecf92432566bebc4a4b6f1901a5cf06de768a