Merge "Use latest KM AIDL API"