Merge "adb: properly erase destroyed jdwp_trackers." am: e02eba8fd2 am: b0e8bbfc99
am: 6c54561d1e

Change-Id: I1a7572937842cf8a80a518e61681c4c88c7285f7