am b236d8c6: Merge "Fix JDWP crash when reporting exception"

* commit 'b236d8c61bb32bb433d1e289be07c427d11985ab':
  Fix JDWP crash when reporting exception