Merge "Use ro.build.version.extensions.r"