[TIMOB-16640] Fixed support for Android SDK Tools 22.6.1.
Merge pull request #5507 from cb1kenobi/timob-16640_3_2_X

[TIMOB-16640] Fixed support for Android SDK Tools 22.6.1.