Merge "Fix socket leaks in various android.net.Network methods." into pi-dev