Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
am: 83c4135

* commit '83c4135a3a50c50890c52d9f2d98c7d2c8661fef':
  Do not set waitForDebugger if the process to be debugged already started

Change-Id: I718c10716f54c49d727d1ce9f6378365d93842f8