Merge "Codec2: remove dependancy from C2 Aidl"