Merge "Support merging target files from directory" am: a0ffed1f am:...

Merge "Support merging target files from directory" am: a0ffed1f am: 609dd3b0 am: 7ffe8ab3 am: 066b7a70

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



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