Merge "Mark libGLESv3 as unversioned until android-24."