Merge "Fix an assert during jdwp debugging." into nyc-dev
am: 988df5652d

* commit '988df5652dad6bea8f7395b86d0ff0bc9364d0b0':
  Fix an assert during jdwp debugging.

Change-Id: I5980ef46ed330afbccd1feb012c2a93f32f2beb6