Merge "Remove duplicate networkstack-aidl-interfaces-java" am: 3e141a27c9 am: df3a9f41c4
am: 8eacbb3396

Change-Id: Id30768cf31dd3a416d0a6b6bbac4496a51d0e56e