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

Change-Id: I63af58293b915f5b70430e6bd58504273f5c2781