Merge "Mark libGLESv3 as unversioned until android-24."
am: a09d0363fd

Change-Id: Ic902107fc0f9f78fa9ab124c99cbb5f976ebbe61