am 12f454e2: Merge changes I7dc2edd4,I419b2ec0

* commit '12f454e24a518d81fe42043b7142582b81694363':
  iotop: add total read/write stats
  iotop: fix bytes per second, and add accumulation