am 7346245f: Merge "Fix the mutex diagnostics, and other targets of opportunity." into ics-mr1-plus-art

* commit '7346245fc3bc37ae119007f16adbb7e7f0b59505':
  Fix the mutex diagnostics, and other targets of opportunity.
tree: 6524b788b77fa220e7997a2b83b39f1f9617738e
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk