Merge "overlayfs: Fix -user build break" am: 7d075866 am: 859473ce am: 9f027869

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



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