am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

* commit '50b68bf8364fd728553cb8066ece8f7905885625':
  Add async events tracing to android.os.Trace