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

Change-Id: I2175da1ac7f75989be77a3d0cdd731c6ec129315