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

Change-Id: Ia685a10eda3a1ea8a84d59098153fa360f726353