Fixup JDWP for obsolete methods am: e3f991ff57
am: f0362504fc

Change-Id: I8dabb90b71171af9a2a89196908ac9edcec73609