am af87659f: Merge "JDWP: Optimized single step during debugging"

* commit 'af87659f462ac650009fce295097cae3dabce171':
  JDWP: Optimized single step during debugging