am 5478c2d9: Merge "Ensure we don\'t AddLocalReference a bogus value when returning to native code from an upcall that threw." into ics-mr1-plus-art

* commit '5478c2d993d3ebafb37c2e783ce942d1a1e2bea0':
  Ensure we don't AddLocalReference a bogus value when returning to native code from an upcall that threw.
tree: 1a75ade18673e1772602e9eea3646bcdf017b8ce
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk