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

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

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



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