Merge pull request #1940 from abarth/improve_android_sdk

Improve error message when Android SDK not found