Merge "Add Codec2 AIDL interface"