Merge "fs_mgr: deprecate check for ro.build.system_root_image" am: 8ef3fe14bb am: 6ed9536bf4
am: c5b0a07a4b

Change-Id: I93cf64123e86392f8df8c3976b7663800c74d559