Merge "Allow setting --boot_variable_file in build-ota-package-target" into main