Merge "Reduce timeout of JDWP tests"