[TIMOB-17168] Fixed bug where the Android detection would fail if the 'add-ons' folder does not exist in the Android SDK folder.
Merge pull request #5809 from cb1kenobi/timob-17168_3_3_X

[TIMOB-17168] Fixed bug where the Android detection would fail if the 'a...
[TIMOB-17175]Updating HTTPClient Library
Merge pull request #5813 from srahim/TIMOB-17175-3_3_X

[TIMOB-17175] 3_3_X Updating HTTPClient Library