Merge branch 'arm/efi-stub' into next