Merge "Add ro.vendor.build.version.sdk to build_vendor_prop" into rvc-dev-plus-aosp