Merge "fs_mgr: overlayfs: dig harder for /dev/root equivalent" am: 2edc7a5128 am: 2a2c596c19
am: 3c911beab3

Change-Id: I4362f5eb63d627cdadd02f80000d8236eb21695d