am d457b9ce: Merge "Add systrace events to monitors and thread suspension"

* commit 'd457b9cebceecc9d54fb569ea76509341153bf5c':
  Add systrace events to monitors and thread suspension