Merge "Reduce timeout of JDWP tests" am: aebc6870db am: c834f6a0a8 am: 0be7d4c32a
am: c37c2a7b45

Change-Id: I8508975096a3bf5e38f95b78bca7de3d708d64ea