Merge "Update AIDL and HIDL utils" into main