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

Change-Id: I5942e732e8fe9500215d249489b94fb2fc80ce1f