android-daemon: Re-design of P2pManager