Merge "fs_mgr: deprecate check for ro.build.system_root_image"