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