Merge "overlayfs: Fix -user build break"