am 167f51a4: Merge "Fix segv in allocation tracking." into ics-mr1-plus-art

* commit '167f51a4316f101a217d5d79501e13adc90b7701':
  Fix segv in allocation tracking.
tree: 45f028e7c868d9976ae86f1924a3dc126bc39a4f
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk