Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c

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

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