Updating build tool versions to work with Android Studio beta update