Merge "Kill stale dalvikvm processes at the end of the jdwp test." am: bfc9d5103b am: 899a9b016e
am: 5f6854710c

* commit '5f6854710cbb1eb1058e655d703da8015dff5563':