Merge "Use ro.vndk.version to check if VNDK is deprecated" into main