Merge "Effect AIDL: correct some code format" into main