Merge pull request #10008 from JosJuice/android-remove-emulationstate Android: Remove the EmulationState class
