Merge "Revert^2 "JDWP: Add test for SourceDebugExtension"" am: 9906d7dc am: 994dbc76 am: a9fc1471 am: 768206ab Change-Id: I76965c2978149e382b708844617e050259cc3fdd