Merge "Mark libGLESv3 as unversioned until android-24."
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index 6a8aac8..cbdd502 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -44,6 +44,9 @@
     name: "libGLESv3.ndk",
     symbol_file: "libGLESv3.map.txt",
     first_version: "18",
+
+    // https://github.com/android-ndk/ndk/issues/265
+    unversioned_until: "24",
 }
 
 cc_defaults {