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

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

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