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