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

Change-Id: Ib646bccd38b96738b611997d95763e7c00919f1b