Merge "e2fsdroid: Fix incorrect error value handling."