Merge "fs_mgr: overlayfs deal with verity detection issues" am: 042f2da1f3 am: 3a78f9775d
am: 5615121eb5

Change-Id: I1ef3dc63b7109d7df059c0dc30f787b432620589