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

Change-Id: I613591810b209fbe895fd505fff606d8c0b60312