Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS"