am 594e76f8: Merge "Fix the Mac build, and clean up some test-only code." into ics-mr1-plus-art

* commit '594e76f8d5fc7c8e419ead1185cfe91dd9036d0c':
  Fix the Mac build, and clean up some test-only code.
tree: 90ff8afe209e1ca535b61b2d5e6548a79bd5adb6
  1. .gitignore
  2. Android.mk
  3. build/
  4. jdwpspy/
  5. src/
  6. test/
  7. tools/