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

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