Merge "Use stable networkstack-aidl-interfaces"