Merge "Fix breakage for android.core.vm-tests-tf tests" into dalvik-dev
tree: ab7ec3c8221063efb6e7cd7816e3d4a49beab720
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk