Manually merge my AOSP update to the VM tests.

Original change: https://android-review.googlesource.com/32051

Bug: http://code.google.com/p/android/issues/detail?id=21599
Bug: http://code.google.com/p/android/issues/detail?id=21597
Change-Id: I31e440b66b720647afab54ca39fd6eb1bbb0cb60
33 files changed
tree: e5d5f9ee5c1fb1c177c453985eeb1242e3d73bf7
  1. Android.mk
  2. build/
  3. jdwpspy/
  4. src/
  5. test/
  6. tools/