Deleted unnecessary code changes for Android which are solved by compiler options.