Merge change 4316 into donut

* changes:
  Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."