Merge "fs_mgr_fstab: allow fileencryption without equals sign"