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

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



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