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

Change-Id: I4c6b3d1acb3b75a2fce6d850b256b15c823c3de1