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

Change-Id: I6ed0b6e51ddb3cd8c20e4a3d771ddff946c0b6ff