More changes for Android gamepad support