Merge "Add APIs for application-generated systrace events" into jb-mr2-dev