Merge "fs_mgr: overlayfs: if existing scratch mountpoint is system_empty" am: bc35f067ac
am: c572335d94

Change-Id: I08e4ef8c3e7eea0ad1deb637f63a6f784060685d