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

Change-Id: I5f899564e0d9885225bfb6c6e2e2c1de59b49636