Merge changes I8405c4fe,I52e6143d

* changes:
  perfprofd: build error
  ext4_utils: -Werror