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

Change-Id: I728c21df77e1aac6e4d9c055369a3c6b8b1cbd62