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

Change-Id: I21ba4a0dfbf2bff187ded1b14ea9c1a6a7ffcb79