Merge "Add uefi image support for yardstick"