am 543154a8: Merge "Fix JDWP class-only modifier."

* commit '543154a81625e2c724b6f794afc664cf9eddf65e':
  Fix JDWP class-only modifier.