Merge "overlayfs: Fix -user build break" am: 7d07586695

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222075

Change-Id: I890fb483f2d86d75b60e4bc289578eee2185658c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>