am 6d0486ef: am ef23396f: am a2d40be3: Merge "Fix JDWP race at runtime shutdown"

* commit '6d0486ef9d1aa05a751a043d3723f48b9c934ca0':
  Fix JDWP race at runtime shutdown