Merge "Add build variant to kernel command line"