Merge "Adopt kernel build generated config"