Android: Fix some additional autoconfigs.