Merge "fs_mgr_overlayfs: Cleanup -user build stubs"