Revert "(Android) Some preliminary changes for new libretro core naming convention - still not"

This reverts commit 1bcf1afc9ed167854ce4c4ee0f31abf7a59c9092.

Conflicts:
	android/phoenix/src/org/retroarch/browser/CoreSelection.java