Second attempt to fix Android x86 ABI handling

This basically reverts 5b09e720 and follows the same approach already used for the Android architecture instead.