am 528b68d4: Merge "Only wait for gdb to attach if debug_db_uid is in the environment." into ics-mr1-plus-art

* commit '528b68d49dcf771231e0a8a70ee0fb6970d6fdba':
  Only wait for gdb to attach if debug_db_uid is in the environment.
tree: b7cca1dde328baf7d9843e74e7587a32b5199bfa
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk