Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" am: 1af42f6473
am: 4c831001fe

Change-Id: I9181908da8448ac628bf4904e0b0e01ffb35daa0