Merge "Update aidl documentation" into main