Merge "Release systrace into platform-tools" into jb-mr2-dev