daemon: Fix dead-lock problem when routing using static routing extension
Merge pull request #126 from morgenroth/Fix-static-routing

daemon: Fix dead-lock problem when routing using static routing extension
android-daemon: Re-design of P2pManager