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