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

Change-Id: I37ff36f51b9f0abe8222e872717519bb2c5af07d