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

Change-Id: I404a70af261a343df0a2933fffd587e97ae8c16c