Merge "Use ro.product.vndk.version for unbundled product apks"