Merge "Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." am: 19c5ee8b am: 24798806 am: c8d4c8fa"