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

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