Merge "Fix JDWP host tests on Trusty."