Merge "Fix an assert during jdwp debugging."
am: 8ccc728d92

* commit '8ccc728d9275ad9bf839507a4979774f26ee7392':
  Fix an assert during jdwp debugging.

Change-Id: I0f16598c3e7cfe44ff00d963d773ef5dcb2d2abf