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

Change-Id: I278f01d4c8e31913bbc1151bd4733ff8158111d0