am 39385aa7: Merge "Clean up the cpuacct cruft."

* commit '39385aa78c5d437cfabc26a1bccdf050a8c94ac4':
  Clean up the cpuacct cruft.