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

Change-Id: I6baae158168ee412c9c54f33bce3ca77b8b16a61