Merge "composer3: fix documentation to match aidl style"