Merge \\"debuggerd: verify that traced threads belong to the right process.\\" into nyc-dev am: d3d04f4d72
am: 1a0d789268

Change-Id: I8a5af9ff5f43e140eb84ba38c5b8e791eaa0bfb9