am 0c173466: Merge "Fix memory leak in JDWP object registry"

* commit '0c1734665c38b3116e38a90ad06c3f152d9316c5':
  Fix memory leak in JDWP object registry