am 80a72369: Merge "Ensure we can Mutex::Wait on a recursively locked Mutex" into ics-mr1-plus-art

* commit '80a72369d74b31c9620bd148508ee893538c2695':
  Ensure we can Mutex::Wait on a recursively locked Mutex
tree: 402610197b7b5561666b191f05180faf23af5f8d
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk