Merge "Always use clang for iotop." am: 18bf41fbe2
am: b87f8f262d

* commit 'b87f8f262d7178307cce84b7832aa4972dab53f3':
  Always use clang for iotop.