Revert "Merge remote-tracking branch 'mirror/master'"

This reverts commit 58207512a7a46ab6b0a2901655957df5f913458a, reversing
changes made to d0e214b704ac61580deda5748842dfe8dfcb84d1.

Conflicts:
	sipXmediaLib/src/mp/codecs/plgopus/plgopus.c
Implemented Opus codec plugin.  Added Opus plugin to Android build.

git-svn-id: http://scm.sipfoundry.org/rep/sipX/main@12193 a612230a-c5fa-0310-af8b-88eea846685b