Merge "project-lakitu: copy shim*.efi for right architecture"