Merge "Mark libGLESv3 as unversioned until android-24." am: a09d0363fd am: 3ee6686fdd
am: 16c25d8168

Change-Id: I45214880c98d4b46c50ba0c3179097e48b0f37b3