Merge "Set odm and vendor build.version.incremental to be publicly readable"