Merge changes from topics "deps_base_dir_filesystem", "filesystem_rootdir" am: cddaddf2b2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1581383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied1ab2198efc05be271ba44141f77fa0d1e04887