Merge "Fixup JDWP for obsolete methods" am: b361403515
am: 221119b825

Change-Id: I3c2fca7b0a2ca40ce0729b1d428a530c6034508d