Merge "Revert "Retire x86_64 16k boards"" into main