Add API level 18, and remove GLES vendor extensions

Change-Id: I6ac045a50cd0f2526cef6a113198c4f431448eef
diff --git a/build/tools/dev-defaults.sh b/build/tools/dev-defaults.sh
index d569ab4..7d3e742 100644
--- a/build/tools/dev-defaults.sh
+++ b/build/tools/dev-defaults.sh
@@ -6,7 +6,7 @@
 # Note: levels 6 and 7 are omitted since they have the same native
 # APIs as level 5. Same for levels 10, 11 and 12
 #
-API_LEVELS="3 4 5 8 9 14"
+API_LEVELS="3 4 5 8 9 14 18"
 
 # Default ABIs for the target prebuilt binaries.
 PREBUILT_ABIS="armeabi armeabi-v7a x86 mips"
diff --git a/build/tools/gen-system-symbols.sh b/build/tools/gen-system-symbols.sh
index 549f6a6..4928306 100755
--- a/build/tools/gen-system-symbols.sh
+++ b/build/tools/gen-system-symbols.sh
@@ -175,6 +175,16 @@
         libOpenSLES.so)
             set_symbol_excludes '^_' '^MPH_' # remove MPH_to_xxx definitions
             ;;
+        libGLESv*.so)
+            # Exclude non-OES extension entry points
+            set_symbol_excludes 'EXT$'
+            set_symbol_excludes 'AMD$'
+            set_symbol_excludes 'ANGLE$'
+            set_symbol_excludes 'APPLE$'
+            set_symbol_excludes 'IMG$'
+            set_symbol_excludes 'NV$'
+            set_symbol_excludes 'QCOM$'
+            ;;
     esac
     filter_symbols "$SYMBOL_TMPFILE"
 }