CB-7536 Tweak Android SDK not installed error message.

We no longer require you to edit your PATH
Merge branch 'master' into 4.0.x (more error message)