Pull new-efi-memmap into release branch