Updating Android SDK + script fixes