Reimplementing fixes for attaching to Unity processes on updated master.

Reimplementing fixes for attaching to Unity processes on updated master.