Merge "e2fsdroid: Fix crash with invalid command line args."