Merge "Fix ota build error when using boot variable files" am: 775187f9

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



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