am 1d5abec2: Merge "Fix Mac build." into ics-mr1-plus-art

* commit '1d5abec2454f3144f2c816674760aaac6e28bd0f':
  Fix Mac build.
tree: 81ced867f22ebf547a61729aec666933deb74ab6
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk