Merge "Add composer3 AIDL"