am 68aefb06: Merge "Fix dex2oat on the Mac." into ics-mr1-plus-art

* commit '68aefb06c449df0bd8a34f3491f7594ee3f9dd0b':
  Fix dex2oat on the Mac.
tree: b42cf458ffe34d79ca9732272d8c3ea20ca7828f
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk