Merge "Stop including systrace in platform tools"