Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev
am: e8d1fac1a6

Change-Id: I8d2a6dcca3df75e44a67e8f7e184d52a6558e1a5