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

* commit '04e48a012ac88589f7561b53a9f19913b9a93b7b':
  Fix an assert during jdwp debugging.

Change-Id: Id6ad0ca6e9fa1e349b5a3cb5edba47324b535c14