Various missing hunks.

These are hunks of changes that seem to have been lost between
ics-mr1-plus-art and dalvik-dev. Maybe bad merge resolutions?

Change-Id: I822c64651dc693df38efa8bc290edb959ce3398c
4 files changed
tree: dc17bb4872b6badd6860d9ce029568bcba3afc43
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk