Merge "Fix clang-tidy warnings in iotop."
am: 1f282c61fa

Change-Id: Ie3440dc2e619ad4168ffe3b0c3cf1d012fba673b