am 83620297: am 31cc1650: Merge "Release systrace into platform-tools" into jb-mr2-dev

* commit '836202974fdabd16d94c4b7589721267bca6b58d':
  Release systrace into platform-tools