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