Merge changes I17c68573,Ic9096cf6

* changes:
  Perfprofd: Work around simpleperf temp dir expectations
  Perfprofd: Remove cutils dependencies