TIMOB-13944: Also search inside build-tools directory for platform tools
Merge pull request #4316 from ayeung/timob-13944-3_1_X

TIMOB-13944-3_1_X: Also search inside build-tools directory for platform tools