Merge "Fix for Mac build." into dalvik-dev
tree: 33a774882cde94f33aeec1683466e0c795dd6863
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk