am 51c479ac: am aa854aff: Merge "JDWP: allocate single step control only when active"

* commit '51c479ac129e98db9b61390ef0ae7bc4d9d0cf5a':
  JDWP: allocate single step control only when active