Merge "Reduce timeout of JDWP tests"
am: aebc6870db

Change-Id: I8f995fc15c007572662f65a2533d998da99c3be8