Merge "Jarjar frameworks/libs/net in NetworkStack module"