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

* commit '21d70d5fd8ff2823a6879d59c7d5a8d6c3e0ce8b':
  Clean up the cpuacct cruft.