[TIMOB-13515] Enabled the avd-abi option to allow building for the x86 emulator.
Merge pull request #4144 from cb1kenobi/timob-13515_3_1_X

[TIMOB-13515] Enabled the avd-abi option to allow building for the x86 e...