Merge "Use stable networkstack-aidl-interfaces" am: 339f9df7d7 am: 19db347595 am: bd62d13b58

Change-Id: Ife21d79d591d6ce773e0fc550cb2227c3dc28018