Merge "ubifs: Fix build issues reported using LLVM"