Merge "ANDROID: tracecmd: Fix temp file paths"