Merge "Revert "Remove Vndk_use_version property from AIDL"" into main