Revert part of r330123
The SUBDIR+= efi removal was part of local testing; revert that part.
This is a direct commit to stable/11.