Merge "Fix incorrect input for path and entry" am: e98964339e

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

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