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

Change-Id: Ia542e16910f9c65fabe22344bbe8e8975a274045