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

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



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