Merge "Make run-jdwp-tests.sh kill zombie dalvikvm processes"
am: d6947136ea

Change-Id: Ia5fc0862a6965fe9aac660c2f9a0e1c5194eeeab