Merge "fs_mgr: overlayfs: pre-emptive filesystem setup" am: 0c615194f4
am: 06f49a58a9

Change-Id: I72164ef136fc7ee3cef86b534133a549302843be