resolved conflicts for merge of bf6863fc to dalvik-dev

Change-Id: Ia2a883928d957f44e554e64369436d0f6d2cb13f
tree: d7200ee765c60fa6d7933a37893621a96949c88b
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk