Merge "Increase timeout for libjdwp tests"