Merge "Rename ro.vendor.product.* to ro.product.vendor.*"