Merge "Revert "ext4_utils: -Werror"" am: 3e3353e88f
am: 884bf31b61

Change-Id: I7ca06a6ce1d35d0525c709392db23d0a71404bba