Merge "CAS: Add AIDL Support"