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

Change-Id: I2adaa88a70ac66f7704bceec06af06fc0f14c245