Merge "Allow ota_from_target_file to work entirely on directories" am:...

Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703 am: 3de45a7b am: 4f600c2a am: c3075321

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



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