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

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