Merge "Revert "Perfprofd: Work around simpleperf temp dir expectations""