Partly revert "Workaround for the PC crash" to fix FC

This reverts commit faeb6d571efa070daeb90815f15d0b77e2097c07 except the Android.mk part.

Conflicts:
	AndroidManifest.xml