Merge "Remove the dependency of dnsresolver_aidl_interface-java"