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