Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c am: 453a130291 am: bd1a49c358 am: 46178f7244

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

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