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

[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 #4146 from vishalduggal/timob-13528

[TIMOB-13528] Ensure barButtonItems do not get into layoutqueue