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

Change-Id: I7202e949f470ec51ef5e82dd7a4644e1a9cef17e