Merge "secure-element to AIDL"