Clean up debugger

Separated logic for native vs java heap, cleaned up lock annotations.
Added missing end of space marker for bump pointer spaces.

Bug: 18730149

Change-Id: I5bc21f0cee83b9cfa357e8a59658885c12cae09c
Merge "Clean up debugger"