Merge "Fix NetworkInterface.getNetworkInterfaces /proc/net/if_inet6 parsing."