Merge "Remove libbinder from libbundleaidl" into main