Merge "fs_mgr: correct support for ro.build.system_root_image"