[upstream] Second round of Kernel Configuration layout changes