Merge "Fix clang-tidy warnings in iotop." am: 1f282c61fa am: 10f8b3cfde am: 388d5e8667
am: cb1e3d6582

Change-Id: I94fdce8e108826155780baa4b7d0d354b9b20d98