Merge "Fixup JDWP for obsolete methods"
am: b361403515

Change-Id: I14cc9a8a92e6d4219128577d61e7b767127ad44a