Merge "Mac build fixes." into dalvik-dev
tree: 5c2745a3b04dc0fa529cfe8bcae3f18b18f5a05b
  1. Android.mk
  2. build/
  3. jdwpspy/
  4. src/
  5. test/
  6. tools/