discovery: simplify discovery/plugin init in android

  Currently discovery factory is using its own context which was
  given during runtime initialization. This makes discovery init
  in Android a bit dirty since we need to keep the android context
  in the initial context and also lock the reference to it.

  This change gets rid of this hack by using the context that is
  given to v23.NewDiscovery() to create a new discovery instance
  if not yet exists.

Change-Id: I00177b90ded8cc2cfe71efeeb7aaff2feae6a49c
MultiPart: 2/3
3 files changed