Merge "JDWP tests need debug info"