Revert "Changes required to accommodate OpenCORE 2.0"

This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.

Conflicts:

	media/libmediaplayerservice/Android.mk
3 files changed