Merge "Split NetworkStackUtils to frameworks/libs/net"