Merge "Clean up filesystem_creator" into main am: f69bffbc81

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3329495

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