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

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

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



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