Merge "JDWP: avoid crash on unsupported modifier"