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

Change-Id: Ia544cfcfe0f73e806094af283e853b95397ac556