Merge "Parameterized linux_system_codename"