am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev

* commit '65b08486fde649e6dd11f17808e7aa85101dea93':
  Add APIs for application-generated systrace events