Merge "Add commands to make jdwp tests dump stacks on timeouts" am: 2456ad11f3
am: d12b12aade

Change-Id: Ibacbdaffaebc2654aeef51a3bc456f42ea2236db