Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf97

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



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