Merge "Increase timeout for libjdwp tests"
am: 06546df504

Change-Id: Iad8c283657b381ebe173746bf1543fa1ec7b91e9