Merge "Add flags field to struct android_net_context"