Merge "Remove requirement that fsv_meta file is next to its input file" into...

Merge "Remove requirement that fsv_meta file is next to its input file" into main am: 2102e1f6 am: 64180e64

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



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