Modified the Android project in order to be compatible to the current
version of the one from the "main" branch of the PC project.