Merge "Always use main thread pid for manual dumping."