Merge \"Add build variant to kernel command line\"
am: 70a9714625

Change-Id: I5e10a5375f50e9562af73407212fd4a800884b20