Revert of Android: Support Android Studio 2.3

build/android/gradle/android.jinja

Index: build/android/gradle/android.jinja
diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
index 4f4a5d5260d1a59c1971d0f073ff2a523644c48d..197f98f298c2f01e416212578fcc1240254b6cf1 100644
--- a/build/android/gradle/android.jinja
+++ b/build/android/gradle/android.jinja
@@ -9,12 +9,14 @@
 {% for path in variables.java_dirs %}
                 "{{ path }}",
 {% endfor %}
-{% if variables.java_files %}
-{% for path in variables.java_files %}
+            ]
+{% if variables.java_excludes %}
+            java.filter.exclude(
+{% for path in variables.java_excludes %}
                 "{{ path }}",
 {% endfor %}
+            )
 {% endif %}
-            ]
             jniLibs.srcDirs = [
 {% for path in variables.jni_libs %}
                 "{{ path }}",