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

* commit '31cc1650cf4509d0b5e4c236f28b2e7620104e42':
  Release systrace into platform-tools