am a2d40be3: Merge "Fix JDWP race at runtime shutdown"

* commit 'a2d40be3e64b339c6c39d59655507c597251e506':
  Fix JDWP race at runtime shutdown