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

Change-Id: I8cf5e8c2f41e990b6c19890605543bb06d99198b