Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8
am: 7880279ac6

Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60