Merge "fs_mgr: overlayfs: dig harder for /dev/root equivalent"