Merge "Terminal: support AIDL"