CB-8176 Update Android SDK search path for Android Studio 1.0
Merge branch 'master' into 4.0.x (SDK search path)