Merge "Add ro.build.system_root_image"