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

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

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