Merge "Effect AIDL: cleanup dependencies" into main