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

Change-Id: I8e0a17b251a51ca25c50639ec668f0aeae07ff4a