Merge "libbinder_ndk: Shim llndk-versioning on Trusty" into main