Merge "libvendorsupport provides an API to replace vndk version" into main