A few updates for Android Studio build.