Merge "Add new tests to Android.mk" into gles32-dev