Merge "fs_mgr: overlay check shared blocks for / if /system is not"
am: 3569a8817d

Change-Id: Ic0e2d6ac6802269db04388ccee9c938bae8f24d5