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

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



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