Also use it to tighten up the code to add the builtin programs.
Also: * counters.rs to solana_metrics * genesis_block.rs to solana_sdk