CB-7511 Auto-detect android sdk when using stand-alone sdk installer
Merge branch 'master' into 4.0.x (better auto-detect sdk)