[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...
[TIMOB-13528] Ensure barButtonItems do not get into layoutqueue
Merge pull request #4147 from vishalduggal/timob-13528-31X

[TIMOB-13528] (3_1_X) Ensure barButtonItems do not get into layoutqueue