Merge "Remove netd_aidl_interfaces-platform-java"