Merge "We replace -d with -O recently, but not uniformly." into dalvik-dev
tree: c2e00badfb03b3769effe66f26dd14ef316c5c9e
  1. Android.mk
  2. build/
  3. jdwpspy/
  4. src/
  5. test/
  6. tools/